Guest?
 
Project
SubGit
Priority
Normal
Type
Bug
State
Fixed
Assignee
Dmitry Pavlenko
Subsystem
Translator Core
Affected versions
1.0.0-RC2
Fix versions
1.0.0 (build 1696)
Fixed in build
No Fixed in build
  • Created by   Semyon Vadishev
    9 months ago (01 Aug 2012 22:40)
  • Updated by   Dmitry Pavlenko
    9 months ago (02 Aug 2012 18:55)
Comments (3)
 
History
  
Linked Issues (?)
 
Semyon Vadishev
  Semyon Vadishev
01 Aug 2012 22:49
9 months ago
At r132 ^/trunk should be merged into ^/shelves/matt_robenolt:

vs@vs:~/workspace/sandbox/mergecommits$ svn pg svn:mergeinfo file://$PWD/repo/shelves/matt_robenolt@131
/branches/0.1.0:40
/shelves/christo:111-116
/shelves/graham_blache:89-90,92,105
/shelves/joe_stump:47,60,100,107
/shelves/lee_semel:71



vs@vs:~/workspace/sandbox/mergecommits$ svn pg svn:mergeinfo file://$PWD/repo/shelves/matt_robenolt@132
/branches/0.1.0:40
/shelves/christo:111-116
/shelves/graham_blache:89-90,92,105
/shelves/joe_stump:47,60,100,107,122-123
/shelves/lee_semel:71
/trunk:120-124

And ^/shelves/joe_stump@123 should not be there, as at r123 this shelf was deleted.
Semyon Vadishev
  Semyon Vadishev
01 Aug 2012 22:52
9 months ago
I've run the following:

vs@vs:~/workspace/sandbox/mcommits/wc$ svn merge ^/trunk
--- Merging r120 through r131 into '.':
U    ajax/encoders.py
U    ajax/endpoints.py
U    ajax/views.py
 U   .
--- Recording mergeinfo for merge of r120 through r131 into '.':
 G   .


Only ^/shelves/joe_stump@122 was merged there as expected.
Dmitry Pavlenko
  Dmitry Pavlenko
02 Aug 2012 16:56
9 months ago
Hope, fixed at r1553 of trunk.
Apply Command

Command Preview: