On Mon, Nov 17, 2008 at 03:56:06PM -0800, Russ Allbery wrote: > Manoj Srivastava <[EMAIL PROTECTED]> writes: > > > Well, I have seen this happen. > > a) update the upstream branch (merge from remote/upstream, or > > git_load_dirs). > > b) Merge upstream branch into topic branches; resolve conflicts. > > c) Merge topic branches into the integration branch (master, for > > me). rerere applies any conflict resolution changes. Do any other > > integration changes, and commit. > > Rather than using rerere, I create a temporary merge branch based off > upstream and merge each topic branch into it in sequence, and then merge > the temporary merge branch into the integration branch, which seems to > accomplish the same thing (not having to re-handle the merge conflicts > when merging the first topic branch).
Yes, it seems to be the simplest and safest way to do (I don't feel confortable using rerere), as I would like to automate that step. And, if you don't need a long-living build branch, this integration branch can actually be the 'build' branch. I think one such integration branch per upstream version would be required and sufficient. -- Nicolas Duboc <[EMAIL PROTECTED]>
Description: Digital signature
_______________________________________________ vcs-pkg-discuss mailing list firstname.lastname@example.org http://lists.alioth.debian.org/mailman/listinfo/vcs-pkg-discuss