search

qbolec / svn_rebase

5 stars 0 forks source link

VIM is opeened in a pipeline when user tries to resolve conflicts #2

Open qbolec opened 10 years ago

qbolec commented 10 years ago 
svn merge -c 111070 'svn://svn.nknet/svnrepo/www.nasza-klasa.pl/branches/NK-15477@112068'
Conflict discovered in 'data/include/groups/idobjects/Group.php'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: e
Vim: Warning: Output is not to a terminal
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
--- Merging r111070 into '.':
U    data/include/groups/sledzik/GroupSledzik.php
C    data/include/groups/idobjects/Group.php
Summary of conflicts:
  Text conflicts: 1
OK
Commit changeset.
svn commit -m 'Remerge of revision 111070 svn://svn.nknet/svnrepo/www.nasza-klasa.pl/branches/NK-15477@112068 by pdorofiejczyk at 2013-07-02T14:12:20.785038Z -- poprawka usuwania wpisów przy usuwaniu grupy i zmiana user_id dla removed_by'
svn: Commit failed (details follow):
svn: Aborting commit: '/home/jlopuszanski/projects/DEV/data/include/groups/idobjects/Group.php' remains in conflict

Non-zero exit code 1. User intervention required. Once you fix the problem, run again with --continue
qbolec commented 10 years ago

Also it seems that the "merge" was not removed from the plan:

jlopuszanski@omega1:~/projects/DEV$ cat .svn_rebase.plan
<?xml version="1.0" encoding="utf-8"?>
<plan>
  <step>
    <comment>Merge changeset 111070.</comment>
    <command>svn merge -c 111070 'svn://svn.nknet/svnrepo/www.nasza-klasa.pl/branches/NK-15477@112068'</command>
  </step>
  <step>
    <comment>Commit changeset.</comment>
    <command>svn commit -m 'Remerge of revision 111070 svn://svn.nknet/svnrepo/www.nasza-klasa.pl/branches/NK-15477@112068 by pdorofiejczyk at 2013-07-02T14:12:20.785038Z -- poprawka usuwania wpisów przy usuwaniu grupy i zmiana user_id dla removed_by'</command>
  </step>
  <step>
    <comment>Merge changeset 112068.</comment>
    <command>svn merge -c 112068 'svn://svn.nknet/svnrepo/www.nasza-klasa.pl/branches/NK-15477@112068'</command>
  </step>
  <step>
    <comment>Commit changeset.</comment>
    <command>svn commit -m 'Remerge of revision 112068 svn://svn.nknet/svnrepo/www.nasza-klasa.pl/branches/NK-15477@112068 by pdorofiejczyk at 2013-07-30T13:27:09.842591Z -- Poprawki infinity loop'</command>
  </step>
</plan>