Rev 6390: Merge trunk resolving conflicts in file:///home/vila/src/bzr/bugs/906897-quoting-stores/

Vincent Ladeuil v.ladeuil+lp at free.fr
Wed Dec 21 20:32:51 UTC 2011


At file:///home/vila/src/bzr/bugs/906897-quoting-stores/

------------------------------------------------------------
revno: 6390 [merge]
revision-id: v.ladeuil+lp at free.fr-20111221203250-2jw5a6hk9f7x7crt
parent: v.ladeuil+lp at free.fr-20111221150215-48asvpm50dumeblc
parent: pqm at pqm.ubuntu.com-20111221191039-ajreq7qxwt64qzgw
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 906897-quoting-stores
timestamp: Wed 2011-12-21 21:32:50 +0100
message:
  Merge trunk resolving conflicts
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/plugins/changelog_merge/tests/test_changelog_merge.py test_changelog_merge-20110310080015-9c3muqni567c1qux-3
  bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
  bzrlib/tests/blackbox/test_branches.py test_branches.py-20110815154803-0t6tna5x9ud2osj3-1
  bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
  bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
  bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
  bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
  bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
  bzrlib/tests/test_gpg.py       testgpg.py-20051017042228-9276cd40a784c93c
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
  bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
  bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
  bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
  doc/developers/configuration.txt configuration.txt-20110408142435-korjxxnskvq44sta-1
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
-------------- next part --------------

Diff too large for email (1244 lines, the limit is 1000).


More information about the bazaar-commits mailing list