package: aegis
version: 4.24.3-2
severity: grave
thanks
This is the first bug in
http://sourceforge.net/mailarchive/message.php?msg_id=26848688
where aede fails with
aegis: project "bug1.1": change 2: file "file1" in the baseline has
changed since the last 'aegis -DIFFerence' command, you need to do a merge
The bug can be worked around by creating a dummy change, merge with
aed -only_merge -GrandParent
and then undo all the changes done by this merge. But I still think this
is a grave bug.
---------- Forwarded message ----------
Date: Wed, 05 Jan 2011 11:49:09 +0100
From: Walter Franzini <walter.franz...@gmail.com>
To: Stefan Fritsch <s...@sfritsch.de>
Cc: aegis-develop...@lists.sourceforge.net, aegis-us...@auug.org.au
Subject: Re: [Aegis-developers] aegis gets confused when renaming files
[cc-ing aegis-users since it may be helpful for others]
Stefan Fritsch <s...@sfritsch.de> writes:
Hi,
Hi,
I have some more problems with aecp -ind -delta and renamed/removed
files. I have created a reproducer which is attached.
Thanks for the report and for the scripts.
[...]
Maybe this one is related
http://sourceforge.net/tracker/?func=detail&aid=1712779&group_id=224&atid=100224
but I am not sure.
Yes it is possible, it seems a UUID clash.
Let me try to explain my *suspects*:
1. in 1.1.C010
new_file f1 (with UUID1)
new_file f3 (with UUID3)
2. close branch 1.1, now the baseline for 1 contains
f1 with UUID1
f3 with UUID3
3. in 1.2.C010
remove_file f1
3. in 1.2.C011 the tricky part:
rename f3 as f1
When you close 1.2.C011 the baseline for 1.2 will contain f1 with
UUID3.
Closing the 1.2 branch will result in the out-of date error since the
uuid for f1 is UUID1 in 1.baseline and UUID3 in 1.2.baseline.
Does it seems right to you?
I'll try to figure how to solve the problem.
ciao
--
Walter Franzini
http://aegis.stepbuild.org/
--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
