lkml.org 
[lkml]   [2002]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectProblems using new Linux-2.4 bitkeeper repository.
Date
From
How do those of us who've been using the

http://gkernel.bitkeeper.net/marcelo-2.4

for development resync against the kernel24.bkbits.net tree? It looks like
the changes from 2.4.18-pre8 onwards all have different patch IDs in the new
tree; so when I try to do a pull from my current repository I get tons of
conflicts, if I try to do a receive of just the patch set I get a resync error:

takepatch: can't find parent ID
jgarzik@mandrakesoft.com|ChangeSet|20020225230300|18879
in RESYNC/SCCS/s.ChangeSet

The thought of taking everything back to the common ancestor and then trying
to apply the changes one at a time and adding the change logs by hand isn't
that appealing (I have 3 2.4 repositories, some with upwards of 10 additional
change sets in them).

James


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:21    [W:0.081 / U:3.020 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site