From: Eli Zaretskii <eliz@gnu.org>
To: Lennart Borgman <lennart.borgman@gmail.com>
Cc: lekktu@gmail.com, 6871@debbugs.gnu.org
Subject: bug#6871: Please make linum-mode per buffer, not per major mode
Date: Fri, 20 Aug 2010 12:05:50 +0300 [thread overview]
Message-ID: <831v9tr6vl.fsf@gnu.org> (raw)
In-Reply-To: <AANLkTi=O8SaLMZdLd1dJg+BwjUB1Y=mAU_AvnJSexX9r@mail.gmail.com>
> From: Lennart Borgman <lennart.borgman@gmail.com>
> Date: Fri, 20 Aug 2010 00:21:40 +0200
> Cc: 6871@debbugs.gnu.org
>
> > That depends. I don't develop on the trunk, but a branch, so if some
> > of the changes are trivial fixes or whatever, I move them to the trunk
> > and commit them right now (so one less thing to think about) and keep
> > the other changes in the branch while I refine them. Else, I commit
> > each change to my branch as separate commits, and then, when the time
> > comes to merge back to the trunk, I decide if they are related or not,
> > so I push them as a merge or separate commits.
>
> Thansk, I think I understand the workflow, but I do not know how to do
> this practically.
>
> Let us say I first in this case write the parts for multi major modes.
> I guess I then submit this to my local rep? How?
You need to create a separate branch, with the "bzr branch" command.
Then you can commit there with "bzr ci".
Alternatively, you can use "bzr ci --local" in the bound branch, but
this is less recommended, since it requires you to be aware of local
commits that you didn't push to the remote repository.
> And how do I make a diff after that? Can I make the diff later on to
> in a simple way?
Ye, "bzr diff" supports versions. E.g.,
bzr diff -r101100..101101
will produce the diffs between the two named versions.
> After this I want to do the other changes to linum immediately so I
> will not forget them. So I do that and submit them to my local rep.
Yes.
> Or should I do something else at this point?
Nothing else is required.
> And what if Stefan (or someone else) now says that the first part
> needs some refinements and I should send a new patch? How can I handle
> that now after I have submitted my first part to my local rep?
You commit another change and use "bzr diff" as above, with a
different couple of revision numbers.
next prev parent reply other threads:[~2010-08-20 9:05 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-17 2:06 bug#6871: Please make linum-mode per buffer, not per major mode Lennart Borgman
2010-08-17 8:59 ` Stefan Monnier
2010-08-17 11:23 ` Lennart Borgman
2010-08-17 12:11 ` Stefan Monnier
2010-08-17 12:35 ` Lennart Borgman
2010-08-18 7:19 ` Stefan Monnier
2010-08-19 4:29 ` Lennart Borgman
2010-08-19 12:13 ` Juanma Barranquero
2010-08-19 13:25 ` Lennart Borgman
2010-08-19 13:38 ` Juanma Barranquero
2010-08-19 14:00 ` Lennart Borgman
2010-08-19 14:40 ` Juanma Barranquero
2010-08-19 21:23 ` Lennart Borgman
2010-08-19 21:57 ` Juanma Barranquero
2010-08-19 22:21 ` Lennart Borgman
2010-08-20 9:05 ` Eli Zaretskii [this message]
2010-08-19 22:43 ` Stefan Monnier
2010-08-20 1:11 ` Lennart Borgman
2010-08-20 12:59 ` Stefan Monnier
2010-08-19 14:45 ` Stefan Monnier
2010-08-19 21:19 ` Lennart Borgman
2010-08-17 23:47 ` MON KEY
2010-08-18 0:14 ` Lennart Borgman
2010-08-18 7:20 ` Stefan Monnier
2010-08-19 17:49 ` MON KEY
2010-08-19 21:18 ` Lennart Borgman
2020-09-19 15:52 ` Lars Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=831v9tr6vl.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=6871@debbugs.gnu.org \
--cc=lekktu@gmail.com \
--cc=lennart.borgman@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).