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

List:       bitkeeper-users
Subject:    Re: [Bitkeeper-users] resolving import conflicts
From:       lm () bitmover ! com (Larry McVoy)
Date:       2006-04-26 20:53:36
Message-ID: 20060426205336.GF24152 () bitmover ! com
[Download RAW message or body]

Try 

	bk patch -p1 -g1 < patch

which will leave the rejects in your repo and you can fix them up by hand.

> I have a patch file, created with bk export, that I'd like to apply to 
> another repository.  However the patch can't be applied to a couple 
> files because of a conflict.
-- 
---
Larry McVoy                lm at bitmover.com           http://www.bitkeeper.com
_______________________________________________
Bitkeeper-users mailing list
Bitkeeper-users@bitmover.com
http://mail.bitmover.com/mailman/listinfo/bitkeeper-users
[prev in list] [next in list] [prev in thread] [next in thread]