[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bitkeeper-users
Subject:    Re: [Bitkeeper-users] Merging
From:       aholtzma () somanetworks ! com
Date:       2003-10-09 18:13:21
[Download RAW message or body]

It would seem that Nathan Binkert (binkertn@umich.edu) said:
> Basically, in bitkeeper, I want to do a bk pull, modify a file, and do
> another bk pull and merge recent changes in that file.  I've gotten an
*snip*
> revision control on these incomplete changes, but I need the update that

bk can't merge anything that doesn't belong to a changeset. So you will
either have to ci/commit those changes, or remove them temporarily. To
accomplish the latter I do something like:

  bk sfiles -c | xargs bk diffs -u > foo.diff
  bk sfiles -c | xargs bk unedit

and re-apply them later with:

  patch -p1 -g 1 < foo.diff

cheers,
aaron

_______________________________________________
Bitkeeper-users mailing list
Bitkeeper-users@bitmover.com
http://bitmover.com/mailman/listinfo/bitkeeper-users
To unsubscribe from this list, go to the above URL, follow instruction at the bottom of the web page.
[prev in list] [next in list] [prev in thread] [next in thread]