Thanks for reminding me these arguments. I think that the most reasonable conclusion is to stick with the release-branch-by-clone model.
-Pierre Le 21 févr. 2012 à 17:16, Jed Ludlow <[email protected]> a écrit : On Tue, Feb 21, 2012 at 2:16 AM, Pierre Raybaut <[email protected]>wrote: > The main advantage of Mercurial is its simplicity. > As written in the hgbook: "In most instances, isolating branches in > repositories is the right approach. Its simplicity makes it easy to > understand; and so it's hard to make mistakes. There's a one-to-one > relationship between branches you're working in and directories on > your system. This lets you use normal (non-Mercurial-aware) tools to > work on files within a branch/repository." > > This being said, if everyone is ok with working with named branches... why > not? > > This was discussed a bit in a previous thread: https://groups.google.com/forum/?fromgroups#!topic/spyderlib/A-0O6krrYRA Since (1) you are already on the release-branch-by-clone model, and (2) Hg allows you to pull changes among repositories as a basic feature I didn't see a compelling reason to change at that time. If you are going to manage multiple releases in a single repo, a model like this is advisable: http://ellislab.com/blog/comments/branchy_management_in_mercurial It most certainly requires you to be very careful about your merges, making sure you know precisely what "direction" you are merging changes, otherwise you can end up merging all the unstable changes onto a release branch. It also requires you to think carefully about how to apply a change that will affect multiple branches (e.g., bug fix). You've got to start at the oldest supported branch and then move forward if you want the merge history to look right. With separate repositories, it's pretty clear when you are pulling changes from one repo to another about which direction you are "merging." > > 2012/2/16, Steve <[email protected]>: > > Is there any chance we can keep all the branches in a single repo > > instead of splitting into multiple repos? > > -- You received this message because you are subscribed to the Google Groups "spyder" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/spyderlib?hl=en. -- You received this message because you are subscribed to the Google Groups "spyder" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/spyderlib?hl=en.
