[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnu-arch-users] Changing ID

From: Stefan Monnier
Subject: [Gnu-arch-users] Changing ID
Date: 21 Apr 2004 16:07:00 -0400
User-agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50

I have had two kinds of problems where a file changes ID:

1 - the tagline was accidentally modified/removed
2 - the ID was moved from .arch-ids to a tagline or vice-versa

In the first case, tla makes it fairly cumbersome to recover the correct
tagline (short of doing `undo').

In the second case it's also rather uncooperative since it treats it as
a "remove+add", thus losing history-info and creating artificial conflicts
when merging the revision into some other branch.

I wish there was a way for tla to say "hmmm, let's represent this
remove+add on the same file name as an ID-change operation".  The ID-change
operation would of course be accompagnied with a diff of the content of the
file has changed (which is basically always the case if you're using

This way `tla file-diffs' could be used to show the accidental tagline
modification in case 1 and in case 2 it would make it possible to reduce
the spurious conflicts.

Any comment?


reply via email to

[Prev in Thread] Current Thread [Next in Thread]