ubuntu-packaging-guide-team team mailing list archive

[Andrew Starr-Bochicchio <a.starr.b@xxxxxxxxx>]

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

-- 
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