Merge lp:~ubuntu-branches/ubuntu/quantal/gvfs/quantal-201208280717 into lp:ubuntu/quantal/gvfs

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/quantal/gvfs reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/quantal/gvfs/quantal-201208280717. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

=== modified file 'debian/changelog'
--- debian/changelog	2012-08-28 08:54:30 +0000
+++ debian/changelog	2012-08-28 07:24:19 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 gvfs (1.13.7-0ubuntu3) quantal; urgency=low
 
   * debian/tests/gvfs-testbed: Fix passing of script arguments.
@@ -16,6 +17,24 @@
 
  -- Martin Pitt <[e-mail]>  Tue, 28 Aug 2012 08:54:30 +0200
 
+=======
+gvfs (1.13.7-0ubuntu3) UNRELEASED; urgency=low
+
+  * debian/tests/gvfs-testbed: Fix passing of script arguments.
+  * debian/tests/gvfs-testbed: Run sandboxed smbd and nmbd, and set up a samba
+    test user with known password.
+  * debian/tests/control: Add samba dependency.
+  * debian/tests/gvfs-test: Add tests for smb:// anonymous and authenticated.
+    The latter only works when running under the testbed, as we need a
+    predictable password.
+  * debian/tests/gvfs-test: Add timeout to waiting for gvfs-mount user prompt,
+    to fix a potential infinite loop when the twisted ftpd does not come up
+    fast enough.
+  * debian/tests/gvfs-testbed: Show samba log files if wrapped program fails.
+
+ -- Martin Pitt <[e-mail]>  Mon, 27 Aug 2012 12:05:56 +0200
+
+>>>>>>> MERGE-SOURCE
 gvfs (1.13.7-0ubuntu2) quantal; urgency=low
 
   * Add debian/tests/ autopkgtest. Currently covers: