Ticket #114 (accepted defect)

Opened 4 years ago

Last modified 11 months ago

Problème lors des conflits

Reported by: phoenix Owned by: phoenix
Priority: urgent Milestone: 0.11.0.X
Component: XINX (Versionning) Version: 0.6.10.0
Keywords: cvs09 Cc:

Description (last modified by phoenix) (diff)

Lors d'un conflit sur un fichier du dossier CVS. XINX ne propose pas un moyen de le résoudre, et ne change pas l'état du ficher (dans le Entries, il est toujours marqué comme en confit : Result of merge avec un + puis la date). Regarder comment est géré toute cette partie dans TortoiseCVS

Change History

Changed 4 years ago by phoenix

(In [431]) refs #114, refs #115, refs #112 A tester

Changed 4 years ago by phoenix

  • milestone changed from 0.6.10.0 to 0.6.11.0

Changed 4 years ago by phoenix

  • status changed from new to assigned

Changed 4 years ago by phoenix

Les conflits seront géré correctement dans une prochaine version.

Changed 4 years ago by phoenix

  • component changed from XINX to XINX (Versionning)

Changed 4 years ago by phoenix

  • priority changed from normal to high

Changed 4 years ago by phoenix

  • priority changed from high to urgent

Changed 4 years ago by phoenix

  • milestone changed from 0.7.0.0 to 0.7.0.1

Changed 4 years ago by phoenix

  • description modified (diff)
  • milestone 0.7.1.0 deleted

Changed 3 years ago by phoenix

  • description modified (diff)
  • milestone set to 0.7.3.0

Changed 3 years ago by phoenix

  • milestone changed from 0.7.3.0 to 0.9.0.0

Changed 2 years ago by phoenix

  • keywords cvs09 added

Changed 2 years ago by phoenix

  • milestone changed from 0.9.0.0 to 0.9.1.0

Changed 11 months ago by phoenix

  • description modified (diff)
  • milestone changed from 0.10.0.X to 0.11.0.X
Note: See TracTickets for help on using tickets.