Попков Александр wrote:
Developer do some commits into own local archive, then do star-merge to main, then delete 
"project-name--devel--0" from own archive.

Then his want to work with this project again, try to

tla tag -S [EMAIL PROTECTED]/project-name--devel--0 [EMAIL 
PROTECTED]/project-name--devel--0

and give error: "conflict in applying patch".

Never ever do that. Revision names in Arch are supposed to be globally unique, which is why they have email addresses in them. When you import, commit or tag, you are permanently assigning a name to the state of your project tree. If you delete [EMAIL PROTECTED]/project-name--devel--0--base-0 and then re-create it, you are breaking the rules, and you can't expect Arch to work. Even if you could successfully tag, star-merge would probably misbehave.


Just use a new version name. Like, for example, [EMAIL PROTECTED]/project-name--devel--1.

Or alternatively, instead of tagging again, just star-merge from main into [EMAIL PROTECTED]/project-name--devel--0.

Or, if you really want to, you can tag into [EMAIL PROTECTED]/project-name--devel--0 without deleting it first. Be warned that star-merge may not behave correctly if you do this (but that would be a bug in star-merge).

Aaron
--
Aaron Bentley
Director of Technology
Panometrics, Inc.


_______________________________________________ Gnu-arch-users mailing list [email protected] http://lists.gnu.org/mailman/listinfo/gnu-arch-users

GNU arch home page:
http://savannah.gnu.org/projects/gnu-arch/
  • ... Попков Александр
    • ... Matthieu Moy
    • ... Aaron Bentley
    • ... Попков Александр
      • ... Matthieu Moy
        • ... Aaron Bentley
      • ... Aaron Bentley

Reply via email to