Rev 5426: Merge backup-names into orphan-non-versioned-files resolving conflicts in file:///home/vila/src/bzr/bugs/323111-orphans/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Fri Oct 15 10:54:40 BST 2010
At file:///home/vila/src/bzr/bugs/323111-orphans/
------------------------------------------------------------
revno: 5426 [merge]
revision-id: v.ladeuil+lp at free.fr-20101015095439-iadpml89khde9bkk
parent: v.ladeuil+lp at free.fr-20100921145324-bkql2l1384ct38i0
parent: v.ladeuil+lp at free.fr-20101015095327-cr1pe5h0gncdw9b7
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: orphan-non-versioned-files
timestamp: Fri 2010-10-15 11:54:39 +0200
message:
Merge backup-names into orphan-non-versioned-files resolving conflicts
added:
NEWS news-20101007064822-9uc24dsvwuur6mzs-1
bzrlib/tests/scenarios.py variations.py-20101008080748-qpn38ldpyvzvkrhg-1
bzrlib/tests/test_scenarios.py test_variations.py-20101008084845-jy33m3zbh2ck1ka1-1
doc/developers/documenting-changes.txt documentingchanges.t-20101013040916-yk0dmle751kjoprm-1
doc/en/release-notes/bzr-0.1.txt bzr0.1.txt-20101008081016-21wd86gpfhllpue3-1
doc/en/release-notes/bzr-0.10.txt bzr0.10.txt-20101008081016-21wd86gpfhllpue3-2
doc/en/release-notes/bzr-0.11.txt bzr0.11.txt-20101008081016-21wd86gpfhllpue3-3
doc/en/release-notes/bzr-0.12.txt bzr0.12.txt-20101008081016-21wd86gpfhllpue3-4
doc/en/release-notes/bzr-0.13.txt bzr0.13.txt-20101008081016-21wd86gpfhllpue3-5
doc/en/release-notes/bzr-0.14.txt bzr0.14.txt-20101008081016-21wd86gpfhllpue3-6
doc/en/release-notes/bzr-0.15.txt bzr0.15.txt-20101008081016-21wd86gpfhllpue3-7
doc/en/release-notes/bzr-0.16.txt bzr0.16.txt-20101008081016-21wd86gpfhllpue3-8
doc/en/release-notes/bzr-0.17.txt bzr0.17.txt-20101008081016-21wd86gpfhllpue3-9
doc/en/release-notes/bzr-0.18.txt bzr0.18.txt-20101008081016-21wd86gpfhllpue3-10
doc/en/release-notes/bzr-0.6.txt bzr0.6.txt-20101008081016-21wd86gpfhllpue3-11
doc/en/release-notes/bzr-0.7.txt bzr0.7.txt-20101008081016-21wd86gpfhllpue3-12
doc/en/release-notes/bzr-0.8.txt bzr0.8.txt-20101008081016-21wd86gpfhllpue3-13
doc/en/release-notes/bzr-0.9.txt bzr0.9.txt-20101008081016-21wd86gpfhllpue3-14
doc/en/release-notes/bzr-0.90.txt bzr0.90.txt-20101008081016-21wd86gpfhllpue3-15
doc/en/release-notes/bzr-0.91.txt bzr0.91.txt-20101008081016-21wd86gpfhllpue3-16
doc/en/release-notes/bzr-0.92.txt bzr0.92.txt-20101008081016-21wd86gpfhllpue3-17
doc/en/release-notes/bzr-1.0.txt bzr1.0.txt-20101008081016-21wd86gpfhllpue3-18
doc/en/release-notes/bzr-1.1.txt bzr1.1.txt-20101008081016-21wd86gpfhllpue3-19
doc/en/release-notes/bzr-1.10.txt bzr1.10.txt-20101008081016-21wd86gpfhllpue3-20
doc/en/release-notes/bzr-1.11.txt bzr1.11.txt-20101008081016-21wd86gpfhllpue3-21
doc/en/release-notes/bzr-1.12.txt bzr1.12.txt-20101008081016-21wd86gpfhllpue3-22
doc/en/release-notes/bzr-1.13.txt bzr1.13.txt-20101008081016-21wd86gpfhllpue3-23
doc/en/release-notes/bzr-1.14.txt bzr1.14.txt-20101008081016-21wd86gpfhllpue3-24
doc/en/release-notes/bzr-1.15.txt bzr1.15.txt-20101008081016-21wd86gpfhllpue3-25
doc/en/release-notes/bzr-1.16.txt bzr1.16.txt-20101008081016-21wd86gpfhllpue3-26
doc/en/release-notes/bzr-1.17.txt bzr1.17.txt-20101008081016-21wd86gpfhllpue3-27
doc/en/release-notes/bzr-1.18.txt bzr1.18.txt-20101008081016-21wd86gpfhllpue3-28
doc/en/release-notes/bzr-1.2.txt bzr1.2.txt-20101008081016-21wd86gpfhllpue3-29
doc/en/release-notes/bzr-1.3.txt bzr1.3.txt-20101008081016-21wd86gpfhllpue3-30
doc/en/release-notes/bzr-1.4.txt bzr1.4.txt-20101008081016-21wd86gpfhllpue3-31
doc/en/release-notes/bzr-1.5.txt bzr1.5.txt-20101008081016-21wd86gpfhllpue3-32
doc/en/release-notes/bzr-1.6.txt bzr1.6.txt-20101008081016-21wd86gpfhllpue3-33
doc/en/release-notes/bzr-1.7.txt bzr1.7.txt-20101008081016-21wd86gpfhllpue3-34
doc/en/release-notes/bzr-1.8.txt bzr1.8.txt-20101008081016-21wd86gpfhllpue3-35
doc/en/release-notes/bzr-1.9.txt bzr1.9.txt-20101008081016-21wd86gpfhllpue3-36
doc/en/release-notes/bzr-2.0.txt bzr2.0.txt-20101008081016-21wd86gpfhllpue3-37
doc/en/release-notes/bzr-2.1.txt bzr2.1.txt-20101008081016-21wd86gpfhllpue3-38
doc/en/release-notes/bzr-2.2.txt bzr2.2.txt-20101008081016-21wd86gpfhllpue3-39
doc/en/release-notes/series-template.txt seriestemplate.txt-20101013054755-s5nh8umufeofyhfz-2
tools/fixed-in.py fixedin.py-20100927214922-jxti5i4kt2ij9f6d-1
renamed:
NEWS => doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
NEWS-template.txt => doc/en/release-notes/release-template.txt newstemplate.txt-20100219053124-f4a3zo3ujiyawh7n-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
README README-20050309040720-8f368abf9f346b9d
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_chk_map_pyx.pyx _chk_map_pyx.pyx-20090309111231-peyz7p2azr0dzdrb-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/chk_map.py chk_map.py-20081001014447-ue6kkuhofvdecvxa-1
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/crash.py crash.py-20090812083334-d6volool4lktdjcx-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/groupcompress.py groupcompress.py-20080705181503-ccbxd6xuy1bdnrpu-8
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
bzrlib/help_topics/en/debug-flags.txt debugflags.txt-20090312050229-rdspqbqq4fzbjtpe-1
bzrlib/lazy_import.py lazy_import.py-20060910203832-f77c54gf3n232za0-1
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/strace.py strace.py-20070323001526-6zquhhw8leb9m6j8-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_alias.py test_alias.py-20080425112253-fbt0yz1c1834jriz-1
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_break_lock.py test_break_lock.py-20060303014503-a90e07d38d042d1d
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_dpush.py test_dpush.py-20090108125928-st1td6le59g0vyv2-1
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_filesystem_cicp.py test_filesystem_cicp-20081028010456-vclkg401m81keaxc-1
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
bzrlib/tests/features.py features.py-20090820042958-jglgza3wrn03ha9e-1
bzrlib/tests/per_bzrdir/__init__.py __init__.py-20100829134954-ax1jw4f3g61xgkfw-2
bzrlib/tests/per_bzrdir/test_bzrdir.py test_bzrdir.py-20100829143338-2uachgod1c3liktl-1
bzrlib/tests/per_lock/test_lock.py test_lock.py-20070313190612-mfpoa7t8kvrgrhj2-1
bzrlib/tests/per_workingtree/test_unversion.py test_unversion.py-20060907074408-bygh2y28jz8u0cg7-1
bzrlib/tests/script.py script.py-20090901081155-yk3tiy1nunxg16ne-1
bzrlib/tests/test_bugtracker.py test_bugtracker.py-20070410073305-vu1vu1qosjurg8kb-2
bzrlib/tests/test_chk_map.py test_chk_map.py-20081001014447-ue6kkuhofvdecvxa-2
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_delta.py test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_groupcompress.py test_groupcompress.p-20080705181503-ccbxd6xuy1bdnrpu-13
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_rio.py test_rio.py-20051128032247-dcd1082dfc86d3d3
bzrlib/tests/test_script.py test_script.py-20090901081156-y90z4w2t62fv7e7b-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_setup.py test_setup.py-20051208073730-4a59a6368c4efa04
bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
bzrlib/tests/test_strace.py test_strace.py-20070323001526-6zquhhw8leb9m6j8-2
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_tuned_gzip.py test_tuned_gzip.py-20060418042056-c576dfc708984968
bzrlib/tests/testui.py testsupport.py-20100914040736-dpw8sndzy6dxk8s1-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/tuned_gzip.py tuned_gzip.py-20060407014720-5aadc518e928e8d2
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/code-review.txt codereview.txt-20100512110229-wywsv1livg919f1f-1
doc/developers/code-style.txt codestyle.txt-20100515105711-133ealf7ereiq2eq-1
doc/developers/contribution-quickstart.txt contributionquicksta-20091118014608-u0t1h53l2t81rir3-1
doc/developers/cycle.txt cycle.txt-20081017031739-rw24r0cywm2ok3xu-1
doc/developers/index-plain.txt indexplain.txt-20090909123806-96yfsgrqwra8cwq7-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
doc/developers/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
doc/en/_templates/index.html index.html-20090722133849-lus2rzwsmlhpgqhv-1
doc/en/admin-guide/other-setups.txt othersetups.txt-20091205144603-lgpl0e0z6lzk2rdw-9
doc/en/conf.py conf.py-20090722133816-63ik5s6s5gsnz7zy-12
doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/en/user-guide/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
doc/en/user-guide/writing_a_plugin.txt writing_a_plugin.txt-20071114035000-q36a9h57ps06uvnl-7
doc/en/whats-new/whats-new-in-2.2.txt whatsnewin2.2.txt-20100304041442-cj7jdn23zakcw08l-1
doc/en/whats-new/whats-new-in-2.3.txt whatsnewin2.3.txt-20100818072501-x2h25r7jbnknvy30-1
doc/ja/user-guide/http_smart_server.txt http_smart_server.tx-20091029100035-1rni8rgpen0pe1g2-41
doc/ja/user-reference/index.txt index.txt-20091029100035-1rni8rgpen0pe1g2-76
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/generate_release_notes.py generate_release_not-20090903045433-6vjlqni6dfgv2ekv-1
tools/win32/bzr_postinstall.py bzr_postinstall.py-20060622100836-b3yup582rt3y0nvm-6
tools/win32/start_bzr.bat start_bzr.bat-20060622100836-b3yup582rt3y0nvm-9
doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
doc/en/release-notes/release-template.txt newstemplate.txt-20100219053124-f4a3zo3ujiyawh7n-1
-------------- next part --------------
Diff too large for email (34881 lines, the limit is 1000).
More information about the bazaar-commits
mailing list