[MacPorts] #27485: make "port sync" git - aware

[MacPorts]

#27485: make "port sync" git - aware
---------------------------------------------+------------------------------
 Reporter:  andy@…                           |       Owner:  macports-tickets@…                   
     Type:  enhancement                      |      Status:  new                                  
 Priority:  Normal                           |   Milestone:                                       
Component:  base                             |     Version:  1.9.2                                
 Keywords:  git, subversion, sync, haspatch  |        Port:                                       
---------------------------------------------+------------------------------
Changes (by ecronin@…):

  * keywords:  git, subversion, sync => git, subversion, sync, haspatch
 * cc: ecronin@… (added)


Comment:

 The change to .svn detection recently committed stopped my previous patch
 from applying cleanly, here's a new version which always includes the git
 stash save/pop step (I was incorrect in comment 3 I believe, a pull does a
 merge which should update the working directory)

 I only test the git-svn half of the patch, but it has worked fine for 10
 months now, blowing up a bit when manual intervention is needed because
 rebase or git stash pop has conflicts (I assume a failed svn update has
 the same issues on a dirty working directory), fixing the conflict and
 running selfupdate again is all that's needed

-- 
Ticket URL: <https://trac.macports.org/ticket/27485#comment:3>
MacPorts <http://www.macports.org/>
Ports system for Mac OS