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

Submitter:  None
Submitted:  Sun 21 Sep 2003 09:36:31 AM UTC
   
 
Category:  tla Severity:  3 - Normal
Item Group:  None Status:  None
Privacy:  Public Open/Closed:  Open
Release:  latest version before srparish.net went down
Fixed Release: 
Merge Request?:  None
Your Archive Name: 
Your Archive Location: 
Assigned to:  None
* Mandatory Fields

Add a New Comment Rich Markup
   

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

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 03:40:30 PM UTC, comment #1: 

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.

Invalid User ID <#11446>
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 Files:
   
   
Comment:
   

No files currently attached

 

Depends on the following items: None found

Items that depend on this one: None found

 

CC list is empty

 

There are 0 votes so far. Votes easily highlight which items people would like to see resolved in priority, independently of the priority of the item set by tracker managers.

Only logged-in users can vote.

 

No changes have been made to this item

Back to the top

Copyright © 2024 Free Software Foundation, Inc.
Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved.
The Levitating, Meditating, Flute-playing Gnu logo is a GNU GPL'ed image provided by the Nevrax Design Team.
Page source code

Powered by Savane 3.13-df36.
Corresponding source code