[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: nobody
Subject: [Bug-gnu-arch] [bug #5461] start-merge: panik conflict applying patch in arch_build_revision
Date: Sun, 21 Sep 2003 05:36:31 -0400
User-agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0; Q312461)

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

Submitted by: None                    Project: GNU arch -- a revision control 
Submitted on: Sun 09/21/2003 at 05: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 

 | * 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


No Followups Have Been Posted

CC list is empty

No files currently attached

For detailed info, follow this link:

  Message sent via/by Savannah

reply via email to

[Prev in Thread] Current Thread [Next in Thread]