On Thu, Jan 8, 2009 at 5:48 AM, Ged
<gedmurphy@gmail.com> wrote:
Aleksey Bragin wrote:
> Live branch needs constant merging. Have a look at amd64 bringup
> branch: most of commits are merges. That mm.patch is an ugly way of
> keeping the branch always uptodate...
This is the reason all my branches are now local (and my lack of commits,
making it look like I do nothing anymore)
It was a great idea until my laptop was stolen and I lost all my code ....
Strange that this just popped up as Timo and I were only talking about this
the other day :
<Physicus> atm I'm fine with SVN for reactos. What i would wish to have
was some kind of "virtual branch" or "intermediate branch" something between
trunk and your local copy where you can commit to and that does receive
commits from trunk. So it stays in sync with trunk.
<Physicus> Both a remote and a local solution would be great
<GedMurphy> that's the exact reason I don't use branches
<Physicus> the sync mess
<GedMurphy> yeah, too much hard work and lost time
<GedMurphy> I have about 5 local branches instead
<GedMurphy> it worked fine, until my laptop was stolen and I lost all my
code ... lol
<GedMurphy> although, I've recreated most of my old branches over the
Christmas period, so I obviously don't learn ;)
<Physicus> That's what my idea is about. You create an intermediate
branch (either locally or on a remote server) then checkout a local copy.
Your commits go to that intermediate branch, but commits to trunk do also go
there. If there's a conflict, you need to resolve it as normally when
working directly with trunk
<GedMurphy> that would be perfect
<Physicus> Make svn people implement something like that and we might
get people working on branches