Clarify whether to commit after "bzr merge-upstream"

There's no need to do a commit before other changes, although you can if you like. The upstream changes are already in the upstream branch and you are left with a merge from that branch into the trunk packaging branch. bzr qlog might clarify this for you.

Please do suggest what is needed to make this clear in the guide

Thanks Jonathan for the answer. May be just add your explanation that the commit is not needed, and is let to the choice of the packager.

On Aug 17, 2011, at 10:33 AM, Christophe Sauthier \(huats\) wrote:

>I am still not confortable what to do right after I used the command
>bzr merg-upstream.
>
>Indeed my branch contains the new upstream version, but should I do a
>commit for that before I start twikking on the debian/ dir or not ?

While a commit is not strictly necessary, I think it's "best practice" because
it separates the changes that occurred due to the merge, from the changes you
make post-merge. I find this helpful in case you make mistakes post-merge;
it's easier to figure out what you touched.

I'm looking at expanding some of the stuff on merging. FWIW, here's my take on the specific question:

dch -im "New upstream release."
debcommit
#hack on /debian
dch -am "Changes"
debcommit
dch -r
debcommit -r