gnu-arch-users
[Top][All Lists]
Advanced

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

Re: [Gnu-arch-users] Re: Problem after deleting archive


From: Aaron Bentley
Subject: Re: [Gnu-arch-users] Re: Problem after deleting archive
Date: Wed, 11 May 2005 19:39:35 -0400
User-agent: Debian Thunderbird 1.0 (X11/20050116)

Matthieu Moy wrote:
This operation (after onetime deleting) clause conflicts... each time...

                  ^^^^^^^^^^^^^^^^^^^^^^
This is the problem.

(deleting your revision library and pristine trees is a part of a
solution)

Since his revisions have been merged into the mainline, I believe that star-merge will be very unhappy if he tries to merge different revisions with the same name later. I believe the presence of patchlogs from the first timeline will cause star-merge to select the wrong base.

Aaron




reply via email to

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