[Bug-gnu-arch] [bug #5461] start-merge: panik conflict applying patch in arch_build_revision

[nobody]

=================== BUG #5461: LATEST MODIFICATIONS ==================
http://savannah.gnu.org/bugs/?func=detailbug&bug_id=5461&group_id=4899

Changes by: Robert Anderson <address@hidden>
Date: Sun 09/21/2003 at 15:40 (GMT)

------------------ Additional Follow-up Comments ----------------------------
It appears that the conflict is simply in building the latest revision of 
--mainline--, and probably has nothing to do with 'star-merge'.  I suspect you 
have a corrupted pristine tree, but that is mostly a guess sight unseen.



Try a fresh 'get' of the --mainline-- tree, and see if it builds without 
conflicts.





=================== BUG #5461: FULL BUG SNAPSHOT ===================


Submitted by: None                    Project: GNU arch -- a revision control 
system
Submitted on: Sun 09/21/2003 at 09:36
Category:  tla                        Severity:  5 - Major                  
Bug Group:  None                      Resolution:  None                     
Status:  Open                         Release:  latest version before 
srparish.net went down
Fixed Release:                        Merge Request?:  None                 
Your Archive Name:                    Your Archive Location:                
Assigned to:  None                    

Summary:  start-merge: panik conflict applying patch in arch_build_revision

Original Submission:  I have a problem with star-merge.  I did some development 
in the test

branch, then replayed all changes into the mainline (patch51).  Now

the test branch is missing that latest patch from the mainline

containing only the changes already present in the test branch.  That

is what start-merge is for as far as I understood.  But it does not

work for me:



 ,-----

 | % tla star-merge voice-fraud--mainline--0.1      

 | * build reference tree for 
address@hidden/voice-fraud--mainline--0.1--patch-51

 | * from pristine cache: address@hidden/voice-fraud--mainline--0.1--patch-50

 | * patching for revision: address@hidden/voice-fraud--mainline--0.1--patch-51

 | PANIC: conflict applying patch in arch_build_revision

 | zsh: exit 2     tla star-merge voice-fraud--mainline--0.1

 `-----



Follow-up Comments
*******************

-------------------------------------------------------
Date: Sun 09/21/2003 at 15:40       By: flat5
It appears that the conflict is simply in building the latest revision of 
--mainline--, and probably has nothing to do with 'star-merge'.  I suspect you 
have a corrupted pristine tree, but that is mostly a guess sight unseen.



Try a fresh 'get' of the --mainline-- tree, and see if it builds without 
conflicts.




CC list is empty


No files currently attached


For detailed info, follow this link:
http://savannah.gnu.org/bugs/?func=detailbug&bug_id=5461&group_id=4899

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/