Matthieu Moy <[EMAIL PROTECTED]> writes: > Quoting Michael Olson <[EMAIL PROTECTED]>: > >> How do I differentiate between patches that I have "recorded" >> locally, and those that have been incorporated in the repo that I'm >> tracking? > > There's no fundamental difference, but you know this with the > commiter ID, and using "bzr missing". > > You can also use the branch nick for that. It is recorded in each > individual patch IIRC.
I guess what I meant to ask was: Can I get a listing of patches that are in my local repo but not in upstream? I guess if I could apply the below method to "bzr missing" and/or "bzr log" that would be sufficient. >> How does this look when translated as actual bzr commands? > > for diff, it would be > > bzr diff -r ancestor:/the/branch/..last:1 > > ancestor:/the/branch means the common ancestor between your branch > and /the/branch, and last:1 is the last revision in your branch. Hmm, interesting. Can I use the branch nickname instead of "/the/branch/"? >> So what are branch nicknames supposed to be used for, then, if not >> names of branches? > > OK, I missunderstood you. I thought you meant put your email address > as the branch nick. OK, a hashtable "branch nick" -> "submission > email" could be OK to me. > > That said, the branch will eventually contain the submission email, > and there will also probably be a way to specify that address in > ~/.bazaar/branches.conf, which allows wildcards on the branch > location, so it will be possible to specify several submission > adresses at the same time. This should be used when available. Certainly. I didn't realize that bzr already had a facility for associating submission addresses with branches. Would this branches.conf file associate the URL with the email address, or the branch nickname with the email address? If it's the former, we might have to encapsulate that information in the patch submission email somehow so it can be used to correctly apply the patch (unless we do a reverse lookup on the submission email address to find the branch ... hmm). -- Michael Olson -- FSF Associate Member #652 -- http://www.mwolson.org/ Interests: Emacs Lisp, text markup, protocols -- Jabber: mwolson_at_hcoop.net /` |\ | | | IRC: mwolson on freenode.net: #hcoop, #muse, #PurdueLUG |_] | \| |_| Project involvement: Emacs, Muse, Planner, ERC, EMMS
pgpv6utU7KPJg.pgp
Description: PGP signature
_______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
