From: W. Trevor King <wking@tremily.us>
Date: Wed, 8 Oct 2014 16:35:15 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/dev-python/webtest'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7f9895118752bdadbc7e109b44b28948078edd5a;p=wtk-overlay.git

Merge remote-tracking branch 'origin/dev-python/webtest'

Pull in this per-package branch with a subtree merge [1]:

  $ git merge -s ours --no-commit origin/dev-python/webtest
  $ git read-tree --prefix=dev-python/dev-python/webtest/ -u origin/dev-python/webtest
  $ git commit -v

so folks who aren't using a version of Layman that supports submodules
(currently everybody) can use this modular package.

[1]: https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html
---

7f9895118752bdadbc7e109b44b28948078edd5a
diff --cc dev-python/webtest/ChangeLog
index 0000000,8a04c35..8a04c35
mode 000000,100644..100644
--- a/dev-python/webtest/ChangeLog
+++ b/dev-python/webtest/ChangeLog
diff --cc dev-python/webtest/Manifest
index 0000000,7cd834c..7cd834c
mode 000000,100644..100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
diff --cc dev-python/webtest/files/webtest-1.3-doctest-ellipsis.patch
index 0000000,38b01ae..38b01ae
mode 000000,100644..100644
--- a/dev-python/webtest/files/webtest-1.3-doctest-ellipsis.patch
+++ b/dev-python/webtest/files/webtest-1.3-doctest-ellipsis.patch
diff --cc dev-python/webtest/files/webtest-1.3.4-index_fixt.patch
index 0000000,5cb75c7..5cb75c7
mode 000000,100644..100644
--- a/dev-python/webtest/files/webtest-1.3.4-index_fixt.patch
+++ b/dev-python/webtest/files/webtest-1.3.4-index_fixt.patch
diff --cc dev-python/webtest/files/webtest-1.4.3-doctest.patch
index 0000000,15b65c5..15b65c5
mode 000000,100644..100644
--- a/dev-python/webtest/files/webtest-1.4.3-doctest.patch
+++ b/dev-python/webtest/files/webtest-1.4.3-doctest.patch
diff --cc dev-python/webtest/metadata.xml
index 0000000,3fcee65..3fcee65
mode 000000,100644..100644
--- a/dev-python/webtest/metadata.xml
+++ b/dev-python/webtest/metadata.xml
diff --cc dev-python/webtest/webtest-1.4.3-r1.ebuild
index 0000000,235eb0c..235eb0c
mode 000000,100644..100644
--- a/dev-python/webtest/webtest-1.4.3-r1.ebuild
+++ b/dev-python/webtest/webtest-1.4.3-r1.ebuild
diff --cc dev-python/webtest/webtest-2.0.11.ebuild
index 0000000,6387ebb..6387ebb
mode 000000,100644..100644
--- a/dev-python/webtest/webtest-2.0.11.ebuild
+++ b/dev-python/webtest/webtest-2.0.11.ebuild