Ubuntu
ettercap package

Code review comment for lp://qastaging/~wibblymat/ubuntu/oneiric/ettercap/merge-debian-0.7.3-2.2

  1. Oneiric (11.10)
  2. merge-debian-0.7.3-2.2
  3. Merge into oneiric
Revision history for this message
Daniel Holbach (dholbach) wrote :

daniel@daydream:~$ bzr branch lp:ubuntu/oneiric/ettercap
Most recent Ubuntu Oneiric version: 1:0.7.3-2.1ubuntu2
Packaging branch status: CURRENT
Most recent Ubuntu Precise version: 1:0.7.4.2-1
Packaging branch status: CURRENT
Branched 16 revisions.
daniel@daydream:~$ cd ettercap/
daniel@daydream:~/ettercap$ bzr merge-package lp:~wibblymat/ubuntu/oneiric/ettercap/merge-debian-0.7.3-2.2
Most recent Ubuntu Precise version: 1:0.7.4.2-1
Packaging branch status: CURRENT
Conflict adding file debian/patches/03_fix_ltmain_check.diff. Moved existing file to debian/patches/03_fix_ltmain_check.diff.moved.
Text conflict in debian/patches/series
2 conflicts encountered.
The merge resulted in 2 conflicts. Please resolve these and commit the changes with "bzr commit".
daniel@daydream:~/ettercap$ bzr conflicts
Conflict adding file debian/patches/03_fix_ltmain_check.diff. Moved existing file to debian/patches/03_fix_ltmain_check.diff.moved.
Text conflict in debian/patches/series
daniel@daydream:~/ettercap$

review: Needs Fixing

« Back to merge proposal