Commits

Dennis Clark committed f281fc5

Patch refresh; fixed pathname used when commiting to a SVN branch

  • Participants
  • Parent commits 4c815d6

Comments (0)

Files changed (1)

File singular.patch

 # HG changeset patch
-# Parent bb64ad4ce982666f971fb808f14f123c57b4fd67
+# Parent 60948939555dbe16336519115dfd244698fb2182
 
-diff -r bb64ad4ce982 hgsubversion/svncommands.py
---- a/hgsubversion/svncommands.py	Wed Nov 17 16:31:48 2010 +0100
-+++ b/hgsubversion/svncommands.py	Wed Nov 17 21:39:09 2010 -0500
-@@ -205,8 +205,8 @@
+diff -r 60948939555d hgsubversion/pushmod.py
+--- a/hgsubversion/pushmod.py	Tue Dec 14 12:09:27 2010 +0100
++++ b/hgsubversion/pushmod.py	Thu Jan 06 23:11:17 2011 +1100
+@@ -95,7 +95,7 @@
+     if meta.layout == 'single':
+         branch_path = ''
+     elif parent_branch and parent_branch != 'default':
+-        branch_path = 'branches/%s' % parent_branch
++        branch_path = 'branch/%s' % parent_branch
+ 
+     extchanges = svnexternals.diff(svnexternals.parse(ui, parent),
+                                    svnexternals.parse(ui, rev_ctx))
+diff -r 60948939555d hgsubversion/svncommands.py
+--- a/hgsubversion/svncommands.py	Tue Dec 14 12:09:27 2010 +0100
++++ b/hgsubversion/svncommands.py	Thu Jan 06 23:11:17 2011 +1100
+@@ -204,8 +204,8 @@
          # find commitpath, write to revmap
          commitpath = revpath[len(subdir)+1:]
          if layout == 'standard':
              elif commitpath == 'trunk':
                  commitpath = ''
              else:
-@@ -239,7 +239,7 @@
+@@ -238,7 +238,7 @@
  
                  if parentpath.startswith('tags/') and parentextra.get('close'):
                      continue
                  elif parentpath == 'trunk':
                      branch = None
                  else:
-@@ -343,7 +343,7 @@
+@@ -349,7 +349,7 @@
      if meta.layout == 'single':
          branchpath = ''
      else:
      ignorelines = ['.hgignore', 'syntax:glob']
      dirs = [''] + [d[0] for d in svn.list_files(branchpath, r)
                     if d[1] == 'd']
-@@ -386,9 +386,9 @@
+@@ -392,9 +392,9 @@
          branchpath = '/trunk'
      elif br.startswith('../'):
          branchpath = '/%s' % br[3:]
      remoterepo = svnrepo.svnremoterepo(repo.ui)
      url = '%s%s' % (remoterepo.svnurl, branchpath)
      author = meta.authors.reverselookup(parent.user())
-diff -r bb64ad4ce982 hgsubversion/svnmeta.py
---- a/hgsubversion/svnmeta.py	Wed Nov 17 16:31:48 2010 +0100
-+++ b/hgsubversion/svnmeta.py	Wed Nov 17 21:39:09 2010 -0500
+diff -r 60948939555d hgsubversion/svnmeta.py
+--- a/hgsubversion/svnmeta.py	Tue Dec 14 12:09:27 2010 +0100
++++ b/hgsubversion/svnmeta.py	Thu Jan 06 23:11:17 2011 +1100
 @@ -50,7 +50,7 @@
  
          author_host = self.ui.config('hgsubversion', 'defaulthost', uuid)
              elts = path.split('/')
              test = '/'.join(elts[:2])
              path = '/'.join(elts[2:])
-diff -r bb64ad4ce982 hgsubversion/wrappers.py
---- a/hgsubversion/wrappers.py	Wed Nov 17 16:31:48 2010 +0100
-+++ b/hgsubversion/wrappers.py	Wed Nov 17 21:39:09 2010 -0500
+diff -r 60948939555d hgsubversion/wrappers.py
+--- a/hgsubversion/wrappers.py	Tue Dec 14 12:09:27 2010 +0100
++++ b/hgsubversion/wrappers.py	Thu Jan 06 23:11:17 2011 +1100
 @@ -242,7 +242,7 @@
      layout = repo.ui.config('hgsubversion', 'layout', 'auto')
      if layout == 'auto':