ubuntu-packaging-guide-team team mailing list archive
-
ubuntu-packaging-guide-team team
-
Mailing list archive
-
Message #00343
[Bug 827925] Re: How to handle a merge
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.
--
You received this bug notification because you are a member of Ubuntu
Packaging Guide Team, which is subscribed to Ubuntu Packaging Guide.
https://bugs.launchpad.net/bugs/827925
Title:
How to handle a merge
Status in Ubuntu Packaging Guide:
New
Bug description:
After reading the page : http://developer.ubuntu.com/packaging/html
/udd-merging.html
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 ?
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu-packaging-guide/+bug/827925/+subscriptions
References