Re: Best practices for developing multiple related branches simultaneously

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



> Also, I'd like to checkout and work on all three branches
> simultaneously.

Julian Phillips's git-new-workdir script in contrib/workdir may
suit your needs.

Having said all that, the first advice is to avoid second
generation topic that depends on another topic when possible.
Is your branchB absolutely need to depend on branchA?


By design they depend upon each other, the other option would
be to work on  them in one branch but submit them separately.
But I don't know of a good way to segregate them for submission
as there are modifications to the same files.

Actually, even now using separate topics, its not as easy as I'd
like if I want to make a "perfect" patch. If I want to make an "imperfect"
patch of a particular topic its very easy, for example:

*) git-checkout branchC
*) git-format-patch -s -n -o patches/branchC branchB

But this will have all my random commits in the patch, to make a
"perfect" patch for branchC I make another branch, branchC1, off
of branchB and use git-am to apply the imperfect patch to branchC1.
and then do another series of commits on branchC1 to make a
perfect patch by choosing the order I commit the files in the final series
of commits.

As you can see my approach to the perfect patch isn't very easy.
I was looking at stgit as a possible solution, but haven't tried it yet
and I've never used quilt so I'm not sure its right either.

Anyway, thanks for the help and if you've got any other suggestions
they would be much appreciated.

Regards,

Wink
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]