Merge lp://qastaging/~ubuntu-branches/ubuntu/lucid/duplicity/lucid-201105300137 into lp://qastaging/ubuntu/lucid/duplicity

Proposed by James Westby
Status: Rejected
Rejected by: Martin Pitt
Proposed branch: lp://qastaging/~ubuntu-branches/ubuntu/lucid/duplicity/lucid-201105300137
Merge into: lp://qastaging/ubuntu/lucid/duplicity
Diff against target: 9527 lines (+8857/-12) (has conflicts)
31 files modified
CHANGELOG (+201/-0)
Changelog.GNU (+3398/-0)
debian/changelog (+74/-0)
debian/patches/01pexpect.dpatch (+22/-0)
duplicity (+107/-0)
duplicity.1 (+54/-0)
po/bg/bg.po (+1283/-0)
po/duplicity.pot (+1241/-0)
po/en_GB/en_GB.po (+1254/-0)
rdiffdir (+4/-0)
rdiffdir.1 (+4/-0)
setup.py (+4/-0)
src/GnuPGInterface.py (+11/-0)
src/asyncscheduler.py (+29/-7)
src/backends/cloudfilesbackend.py (+128/-0)
src/backends/giobackend.py (+148/-0)
src/backends/sshbackend.py (+23/-4)
src/backends/tahoebackend.py (+90/-0)
src/collections.py (+24/-0)
src/commandline.py (+586/-0)
src/diffdir.py (+22/-0)
src/dup_temp.py (+55/-0)
src/globals.py (+25/-0)
src/lazy.py (+4/-0)
src/librsync.py (+10/-0)
src/log.py (+7/-0)
src/manifest.py (+15/-0)
src/patchdir.py (+15/-0)
src/path.py (+5/-0)
src/selection.py (+13/-0)
src/tarfile.py (+1/-1)
Text conflict in CHANGELOG
Text conflict in Changelog.GNU
Text conflict in debian/changelog
Text conflict in debian/patches/01pexpect.dpatch
Text conflict in duplicity
Text conflict in duplicity.1
Text conflict in po/bg/bg.po
Contents conflict in po/bg/duplicity.mo
Text conflict in po/duplicity.pot
Contents conflict in po/en_GB/duplicity.mo
Text conflict in po/en_GB/en_GB.po
Text conflict in rdiffdir
Text conflict in rdiffdir.1
Text conflict in setup.py
Text conflict in src/GnuPGInterface.py
Text conflict in src/asyncscheduler.py
Conflict adding file src/backends/cloudfilesbackend.py.  Moved existing file to src/backends/cloudfilesbackend.py.moved.
Text conflict in src/backends/giobackend.py
Text conflict in src/backends/sshbackend.py
Conflict adding file src/backends/tahoebackend.py.  Moved existing file to src/backends/tahoebackend.py.moved.
Text conflict in src/collections.py
Text conflict in src/commandline.py
Text conflict in src/diffdir.py
Text conflict in src/dup_temp.py
Text conflict in src/globals.py
Text conflict in src/lazy.py
Text conflict in src/librsync.py
Text conflict in src/log.py
Text conflict in src/manifest.py
Text conflict in src/patchdir.py
Text conflict in src/path.py
Text conflict in src/selection.py
To merge this branch: bzr merge lp://qastaging/~ubuntu-branches/ubuntu/lucid/duplicity/lucid-201105300137
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+62812@code.qastaging.launchpad.net

Description of the change

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/duplicity now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/duplicity/lucid-201105300137. A merge should be performed if necessary.

To post a comment you must log in.

Unmerged revisions

16. By Michael Terry

* Merge from debian unstable, remaining changes: (LP: #428206)
  - 02gnupginterface.dpatch: Use system's python-gnupginterface
* fixed ssh backend failure (tried to import local pexpect module)
  (closes: #556095)
* New upstream release (closes: #539903, #420858)
* does no longer depend on python-gnupginterface: upstream
  provides a modified version which is claimed to be incompatible
* does not install a local version of python-pexpect
  anymore (closes: #555359)
* adjusted rules to cater for future python2.6 install
  setup (closes: #547825)
* New upstream release
* lifted standards version
* New upstream release (closes: #536361, #537260, #42858,
  #399371, #388180, #386749 )
* new project homepage
* added notes regarding changed archive-dir behaviour

15. By Michael Terry

Merging shared upstream rev into target branch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: