#36 Bug when merging branch with parent

open
nobody
None
5
2007-04-09
2007-04-09
No

[originally reported by Pieter Nagel]

Threads are archived at the following URLs:

http://groups.yahoo.com/group/aegis-users/message/4043
http://www.auug.org.au/mailman/private/aegis-users/2004/002033.html

----------[ original message ]---------------------
Using aegis 4.18, I am trying to merge a branch "dante.3.45.1" with its
parent. Some files cause aegis to abort with a "You have found a bug"
message:

~ aem -grandparent binsrc/restart.py
aegis: appending log to "/net/katvis/pieter/dante.3.45.1.C044/aegis.log"
aegis: cd /net/pixar/aegis/dante/history
/net/pixar/aegis/dante/history/6e.uui/6b.uui/5def8b0a.429/1a138ba6.21f/3549a0,v
--> standard output
revision 1.6
aegis: you have found a bug (file libaegis/project/file/path.cc, line 83)
please report it immediately

The file in question was created on the parent branch, and then aemv'ed
twice inside the branch - this might be the cause of the bug. It was
created on "dante.3.45" as "bin/restart", then renamed to
"bin/src/restart.py", and renamed again to its current name
"binsrc/restart.py".

Discussion

  • High Performance Coder

    Logged In: YES
    user_id=1509346
    Originator: NO

    I appear to have come across the same bug in 4.22.D005. aed -gp reports:

    aegis: you have found a bug (file libaegis/project/file/path_by_meta.cc, line
    78) please report it immediately

    I attach a copy of the entire repository that causes the issue. It occurs when attempting to perform a grandparent merge on branch 4.6.

    Whoops, it looks like I need to open a new bug to attach a file.

     
  • High Performance Coder

    Logged In: YES
    user_id=1509346
    Originator: NO

    My new bug never opened up - timed out when uploading the example repository.
    However, the bug I found is fixed in the 4.24 release candidate (4.23.D431).

     

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks