Debian Bug report logs - #610984
aegis: Can't close a branch if files have been renamed in particular ways

version graph

Package: aegis; Maintainer for aegis is Walter Franzini <walter.franzini@gmail.com>; Source for aegis is src:aegis.

Reported by: Stefan Fritsch <sf@sfritsch.de>

Date: Mon, 24 Jan 2011 16:57:01 UTC

Severity: important

Tags: squeeze-ignore

Found in version aegis/4.24.3-2

Reply or subscribe to this bug.

Toggle useless messages

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to debian-bugs-dist@lists.debian.org, Walter Franzini <walter.franzini@gmail.com>:
Bug#610984; Package aegis. (Mon, 24 Jan 2011 16:57:04 GMT) Full text and rfc822 format available.

Acknowledgement sent to Stefan Fritsch <sf@sfritsch.de>:
New Bug report received and forwarded. Copy sent to Walter Franzini <walter.franzini@gmail.com>. (Mon, 24 Jan 2011 16:57:04 GMT) Full text and rfc822 format available.

Message #5 received at submit@bugs.debian.org (full text, mbox):

From: Stefan Fritsch <sf@sfritsch.de>
To: submit@bugs.debian.org
Subject: aegis: Can't close a branch if files have been renamed in particular ways
Date: Mon, 24 Jan 2011 17:54:20 +0100 (CET)
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.franzini@gmail.com>
To: Stefan Fritsch <sf@sfritsch.de>
Cc: aegis-developers@lists.sourceforge.net, aegis-users@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 <sf@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/




Added tag(s) squeeze-ignore. Request was from "Adam D. Barratt" <adam@adam-barratt.org.uk> to control@bugs.debian.org. (Mon, 24 Jan 2011 17:48:09 GMT) Full text and rfc822 format available.

Information forwarded to debian-bugs-dist@lists.debian.org, Walter Franzini <walter.franzini@gmail.com>:
Bug#610984; Package aegis. (Sun, 04 Mar 2012 16:48:03 GMT) Full text and rfc822 format available.

Acknowledgement sent to Javi Merino <cibervicho@gmail.com>:
Extra info received and forwarded to list. Copy sent to Walter Franzini <walter.franzini@gmail.com>. (Sun, 04 Mar 2012 16:48:03 GMT) Full text and rfc822 format available.

Message #12 received at 610984@bugs.debian.org (full text, mbox):

From: Javi Merino <cibervicho@gmail.com>
To: 610984@bugs.debian.org
Cc: control@bugs.debian.org
Subject: Downgrade #610894 to important
Date: Sun, 4 Mar 2012 16:45:29 +0000
[Message part 1 (text/plain, inline)]
severity 610894 important
thanks

Though it's an important bug, there's a workaround for the data loss
it may create.  Downgrading accordingly.  Cheers, Javi
[signature.asc (application/pgp-signature, inline)]

Severity set to 'important' from 'grave' Request was from Javi Merino <vicho@debian.org> to control@bugs.debian.org. (Sun, 04 Mar 2012 17:03:11 GMT) Full text and rfc822 format available.

Send a report that this bug log contains spam.


Debian bug tracking system administrator <owner@bugs.debian.org>. Last modified: Thu Apr 24 05:16:06 2014; Machine Name: beach.debian.org

Debian Bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.