[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Weird results of star-merge
From: |
Juliusz Chroboczek |
Subject: |
[Gnu-arch-users] Weird results of star-merge |
Date: |
23 Jun 2004 22:13:30 +0200 |
User-agent: |
Gnus/5.09 (Gnus v5.9.0) Emacs/21.1 |
polipo--stable--0.9 was originally a tag of polipo--devel--0--patch-31
that has since lived its own way. I regularly merge the fixes in
stable--0.9 into devel--0.
Now recently I fixed a bug in polipo--devel--0, committed it as
polipo--devel--0--patch-81, and merged it as polipo--stable--0.9--patch-13.
Now when I do
cd polipo-stable
tla star-merge polipo--stable--0.9
tla changes --diffs
I see polipo--devel--0--patch-32 through 80 being marked as deleted.
Doing tla logs confirms that.
Is that the expected behaviour, or have I done something wrong? How
am I supposed to merge polipo--stable--0.9--patch-14 and later into
polipo--devel? Replay?
Juliusz
P.S. In case you want to reproduce the problem, please see
address@hidden
http://www.pps.jussieu.fr/~jch/software/arch/address@hidden
- [Gnu-arch-users] Weird results of star-merge,
Juliusz Chroboczek <=