svn merge --dry-run Show svn diff -


i'm working codebase has (historically) been merged hand rather via svn merge. i'm trying change proving how useful merge - when dry run, this:

$ svn merge [[repo url]] . -c 21355,21358,21364,21370,21371,21373 --dry-run --- merging r21355 '.': u    [[file 1]] --- merging r21355 '[[dir]]': u    [[dir]]/[[file 2]] u    [[dir]]/[[file 3]] --- merging r21358 '[[dir]]': u    [[dir]]/[[file 4]] --- merging r21364 '[[dir]]': u    [[dir]]/[[file 2]] c    [[dir]]/[[file 4]]     --- merging r21370 '[[dir]]': u    [[dir]]/[[file 5]] --- merging r21371 '[[dir]]': u    [[dir]]/[[file 5]] --- merging r21373 '[[dir]]': c    [[dir]]/[[file 5]] u    [[dir]]/[[file 6]] summary of conflicts:   text conflicts: 2

i have 2 files (listed 4 , 5, respectively), survive 1 merge pop conflict last one. i'm trying figure out conflict now, , see if can resolve it. i'd if can force svn spit out diff of 2 conflicted changes.

i checked out new working copy of narrowest directory, , when ran merge without dry run, got:

--- merging r21355 '.': u    [[file 3]] --- merging r21358 '.': u    [[file 4]] --- merging r21364 '.': g    [[file 4]] --- merging r21370 '.': u    [[file 5]] --- merging r21371 '.': g    [[file 5]] --- merging r21373 '.': g    [[file 5]]

(files 1, 2, , 6 reside elsewhere)

so, i'm confused - dry run reports conflict, when merge run, it's successful? intended behaviour? i'll admit i'm no svn wizard, i'm left quite bewildered.

this expected behavior --dry-run, not modify filesystem.

because specified individual revisions, revisions being applied separately, 1 after another. g in merge output means merge occured - svn made change file had local change.

in detail:

  • r21358 modifies file 4.
  • in normal merge, file 4 has local changes , r21364 merges changes because diff matches current state of file.
  • in dry-run, file 4 not changed r21358. file not match next revision, r21364, expects be, conflict instead.
  • the same things happens r21373 - either r21370 or r21371 modified same part of file applies to.
  • r21371 not suffer because affects different part of file 5 r21370.

once you're past these hiccups, you'll able merge of these in 1 go, without having specify individual revisions, , difference between dry-run , regular merge go away.


Comments

Post a Comment

Popular posts from this blog

c# - DetailsView in ASP.Net - How to add another column on the side/add a control in each row? -

i have detailsview control on page used edit various fields of record, works in respect. i looking way add 1 column (and if works, why not more) right, absolutely read-only, show same fields of record comparison purposes. i aware there no obvious way such thing out of box detailsview . have looked other controls (transposed gridview , recommended formview , listview ), nothing satisfies. have special data binding setup using detailsview , can't out of without losing features. anyone on how "hack in" additional columns (for display only) on detailsview ? the solution have now, use second detailsview , visible set false in aspx. in code, make sure databind hidden detailsview hosts data third column first, initial detailsview named itemdetails . and in item created event, pass third column html rendering of hidden controls (in last code block) : protected void itemdetails_itemcreated(object sender, eventargs e) { if (dataite
Read more

javascript - firefox memory leak -

i have following script (i use raphaeljs also) draws circle, waits 1 second, draws circle again, etc (you can copy paste - functional, need include raphael raphaeljs.com): <div id="holder"> </div> <script src="raphael.js" type="text/javascript"></script> <script> var paper = raphael(10, 50, 320, 200); var rad = math.pi / 180; var finangle = 0; function sector(cx, cy, r, startangle, endangle, params) { var x1 = cx + r * math.cos(-startangle * rad), x2 = cx + r * math.cos(-endangle * rad), y1 = cy + r * math.sin(-startangle * rad), y2 = cy + r * math.sin(-endangle * rad); return ["m", cx, cy, "l", x1, y1, "a", r, r, 0, +(endangle - startangle > 180), 0, x2, y2]; } var path = sector(100,100,50,0,180); var arc = paper.path(path); function draw() { path = sector(100,100,50,0,finangle);
Read more

Trying to import CSV file to a SQL Server database using asp.net and c# - can't find what I'm missing -

i student , quite new programming, , given task using asp.net , c#, without being taught either. plan learn teach ourselves. the task stuck on making website import csv file sql server database of last year's room bookings around campus. the table has following columns: request_id; priority; module_id; day; start_time; length; park; students; room_code; status; semester_id; linked_request; week_1; week_2; week_3; week_4; week_5; week_6; week_7; week_8; week_9; week_10; week_11; week_12; week_13; week_14; week_15; ) in code, try make work 3 columns (request_id,priority,module) starters. when press import button, want read .csv file (with fixed name @ fixed directory) eg "1,2,3" - comma separating fields [delimiter] - , import sql server datab
Read more