[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: GNU Emacs is on Bazaar now.
From: |
Óscar Fuentes |
Subject: |
Re: GNU Emacs is on Bazaar now. |
Date: |
Tue, 29 Dec 2009 03:16:03 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.1.90 (gnu/linux) |
"Stephen J. Turnbull" <address@hidden> writes:
> Óscar Fuentes writes:
>
> > No, because you are committing to upstream, not pushing, i.e. every
> > commit just adds one history item to upstream on top of the previous,
> > without attached or "hidden" revisions, which is perfectly fine for
> > simple changes.
>
> Except in the case of a conflict. Can you confirm that works smoothly
> with the proposed "bzr update" workflow?
That is not different from CVS or Subversion: you update before commit,
you get conflicts, you resolve them, you commit.
> > The last example has one redundant (although hidden by default) log
> > entry, requires more commands and suffers from the "double commit"
> > nuisance that Kenichi Handa mentioned at the beginning of this thread.
>
> This can be easily automated, though.
>
> And what happens if he actually uses a feature branch?
Then he should use the adequate workflow for a feature branch.
[snip]
> I think there's a lot of room for icky things[tm] to happen if the
> bzr-update- and-work-on-trunk discipline is mixed with the
> push-through-a-dedicated- trunk-mirror-branch discipline.
Can you describe some of those icky things?
--
Óscar
- Re: GNU Emacs is on Bazaar now., (continued)
- Re: GNU Emacs is on Bazaar now., Óscar Fuentes, 2009/12/28
- Re: GNU Emacs is on Bazaar now., Karl Fogel, 2009/12/28
- Re: GNU Emacs is on Bazaar now., Óscar Fuentes, 2009/12/28
- Re: GNU Emacs is on Bazaar now., Karl Fogel, 2009/12/28
- Re: GNU Emacs is on Bazaar now., Óscar Fuentes, 2009/12/28
- Re: GNU Emacs is on Bazaar now., Stephen J. Turnbull, 2009/12/28
- Re: GNU Emacs is on Bazaar now., Karl Fogel, 2009/12/28
- Re: GNU Emacs is on Bazaar now.,
Óscar Fuentes <=
- Re: GNU Emacs is on Bazaar now., Stephen J. Turnbull, 2009/12/28
- Re: GNU Emacs is on Bazaar now., Óscar Fuentes, 2009/12/28
- Re: GNU Emacs is on Bazaar now., Kevin Rodgers, 2009/12/29
- Re: GNU Emacs is on Bazaar now., Juanma Barranquero, 2009/12/29
- Re: GNU Emacs is on Bazaar now., Karl Fogel, 2009/12/29
- Re: GNU Emacs is on Bazaar now., Juanma Barranquero, 2009/12/29
- Re: GNU Emacs is on Bazaar now., Óscar Fuentes, 2009/12/29
- Re: GNU Emacs is on Bazaar now., Eli Zaretskii, 2009/12/29
- Re: GNU Emacs is on Bazaar now., Juanma Barranquero, 2009/12/29
- Re: GNU Emacs is on Bazaar now., Eli Zaretskii, 2009/12/29