bugGNU arch -- a revision control system - Bugs: bug #5461, start-merge: panik conflict...

 
 

bug #5461: start-merge: panik conflict applying patch in arch_build_revision

Submitted by:  None
Submitted on:  Sun 21 Sep 2003 09:36:31 AM UTC  
 
Category: tlaSeverity: 3 - Normal
Item Group: NoneStatus: None
Privacy: PublicOpen/Closed: Open
Release: latest version before srparish.net went down
Fixed Release: 
Merge Request?: None
Your Archive Name: 
Your Archive Location: 
Assigned to: None

Add a New Comment(Rich Markup)
   

You are not logged in

Please log in, so followups can be emailed to you.

 

Sun 21 Sep 2003 10:09:47 PM UTC, comment #1:

Never mind. Problem is cause by checking in =tagging-method
with "untagged-source" with an old tla.

The "solution" would be that tla wouldnot tolerate unknown directives in =tagging-method.

Anonymous
Sun 21 Sep 2003 09:36:31 AM UTC, 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 upf@uu.net--2003-uunet/voice-fraud--mainline--0.1--patch-51
| * from pristine cache: upf@uu.net--2003-uunet/voice-fraud--mainline--0.1--patch-50
| * patching for revision: upf@uu.net--2003-uunet/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
`-----

Anonymous

 

(Note: upload size limit is set to 16384 kB, after insertion of the required escape characters.)

Attach File(s):
   
   
Comment:
   

No files currently attached

 

Depends on the following items: None found

Items that depend on this one: None found

 

CC list is empty

 

Do you think this task is very important?
If so, you can click here to add your encouragement to it.
This task has 0 encouragements so far.

Only logged-in users can vote.

 

Please enter the title of George Orwell's famous dystopian book (it's a date):

 

 

No Changes Have Been Made to This Item

Back to the top


Powered by Savane 3.1-cleanup1