[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Re: -L option for tag?
From: |
Tom Lord |
Subject: |
Re: [Gnu-arch-users] Re: -L option for tag? |
Date: |
Fri, 19 Sep 2003 17:29:10 -0700 (PDT) |
> From: Tom Lord <address@hidden>
> There is no context-independent "usual problem" wrt merge operators,
> as far as I can tell. That's why the tutorial has the structure it
> does. With a little bit of constraints, _then_ "usual problems"
> arise and have solutions:
> The tutorial describes particular disciplined patch flows (but doesn't
> call them that since people balk at the mention of "discipline").
> So, you get "The update/commit Style of Cooperation" and "Development
> Branches -- The star-merge Style of Cooperation" and (not in the
> tutorial but mentioned on the list): "Using Multiple Branches Yourself
> -- the Prism Merge Style of Hacking" and "Idempotent Merging -- The
> --skip-present Style of Cooperation".
> So, if you have "The Miles Bader Style" and need some options/commands
> for it .......
And now I think we should all be scared because, obviously, this
points towards adding a merging-with-arch command that is the moral
equivalent of the lisp `loop' macro.
-t
- Re: [Gnu-arch-users] Re: -L option for tag?, (continued)
- [Gnu-arch-users] Re: -L option for tag?, Robert Anderson, 2003/09/19
- Re: [Gnu-arch-users] Re: -L option for tag?, Robert Anderson, 2003/09/19
- [Gnu-arch-users] Re: -L option for tag?, Miles Bader, 2003/09/19
- Re: [Gnu-arch-users] Re: -L option for tag?, Stephen J. Turnbull, 2003/09/19
- Re: [Gnu-arch-users] Re: -L option for tag?, Tom Lord, 2003/09/19
- [Gnu-arch-users] Re: -L option for tag?, Miles Bader, 2003/09/19
- Re: [Gnu-arch-users] Re: -L option for tag?, Tom Lord, 2003/09/19
- Re: [Gnu-arch-users] Re: -L option for tag?,
Tom Lord <=
- Re: [Gnu-arch-users] Re: -L option for tag?, Robert Collins, 2003/09/19
- Re: [Gnu-arch-users] Re: -L option for tag?, Tom Lord, 2003/09/19
- Re: [Gnu-arch-users] Re: -L option for tag?, Robert Collins, 2003/09/19
- Re: [Gnu-arch-users] Re: -L option for tag?, Andrew Suffield, 2003/09/20
- merge algorithms (Re: [Gnu-arch-users] Re: -L option for tag?), Doran Moppert, 2003/09/20
- Re: merge algorithms (Re: [Gnu-arch-users] Re: -L option for tag?), Andrew Suffield, 2003/09/20
- Re: merge algorithms (Re: [Gnu-arch-users] Re: -L option for tag?), Doran Moppert, 2003/09/20
- Re: merge algorithms (Re: [Gnu-arch-users] Re: -L option for tag?), Andrew Suffield, 2003/09/20
- Re: merge algorithms (Re: [Gnu-arch-users] Re: -L option for tag?), Robert Collins, 2003/09/20