Subversion: how to interpret diff results?
up vote
4
down vote
favorite
I have just started to use svn. When comparing to files using svn diff command, the output seems to be very odd. How to intepret diff output? I tried svn diff help but it did not tell anything useful about the output (or I did not understand it).
svn
edited Apr 5 at 7:29
Laurent H.
3,9111530
asked Aug 18 '10 at 11:22
juur
2,327102634
add a comment |
up vote
4
down vote
favorite
I have just started to use svn. When comparing to files using svn diff command, the output seems to be very odd. How to intepret diff output? I tried svn diff help but it did not tell anything useful about the output (or I did not understand it).
svn
edited Apr 5 at 7:29
Laurent H.
3,9111530
asked Aug 18 '10 at 11:22
juur
2,327102634
Can you provide screenshots of what you don't understand, that'd be the easiest way to help.
– XstreamINsanity
Aug 18 '10 at 11:23
e.g what this means: @@ -10,6 +10,7 @@
– juur
Aug 18 '10 at 11:28
add a comment |
up vote
4
down vote
favorite
up vote
4
down vote
favorite
I have just started to use svn. When comparing to files using svn diff command, the output seems to be very odd. How to intepret diff output? I tried svn diff help but it did not tell anything useful about the output (or I did not understand it).
svn
edited Apr 5 at 7:29
Laurent H.
3,9111530
asked Aug 18 '10 at 11:22
juur
2,327102634
I have just started to use svn. When comparing to files using svn diff command, the output seems to be very odd. How to intepret diff output? I tried svn diff help but it did not tell anything useful about the output (or I did not understand it).
svn
svn
edited Apr 5 at 7:29
Laurent H.
3,9111530
asked Aug 18 '10 at 11:22
juur
2,327102634
edited Apr 5 at 7:29
Laurent H.
3,9111530
asked Aug 18 '10 at 11:22
juur
2,327102634
edited Apr 5 at 7:29
Laurent H.
3,9111530
edited Apr 5 at 7:29
Laurent H.
3,9111530
edited Apr 5 at 7:29
Laurent H.
3,9111530
3,9111530
asked Aug 18 '10 at 11:22
juur
2,327102634
asked Aug 18 '10 at 11:22
juur
2,327102634
asked Aug 18 '10 at 11:22
juur
2,327102634
2,327102634
Can you provide screenshots of what you don't understand, that'd be the easiest way to help.
– XstreamINsanity
Aug 18 '10 at 11:23
e.g what this means: @@ -10,6 +10,7 @@
– juur
Aug 18 '10 at 11:28
add a comment |
Can you provide screenshots of what you don't understand, that'd be the easiest way to help.
– XstreamINsanity
Aug 18 '10 at 11:23
e.g what this means: @@ -10,6 +10,7 @@
– juur
Aug 18 '10 at 11:28
Can you provide screenshots of what you don't understand, that'd be the easiest way to help.
– XstreamINsanity
Aug 18 '10 at 11:23
Can you provide screenshots of what you don't understand, that'd be the easiest way to help.
– XstreamINsanity
Aug 18 '10 at 11:23
e.g what this means: @@ -10,6 +10,7 @@
– juur
Aug 18 '10 at 11:28
e.g what this means: @@ -10,6 +10,7 @@
– juur
Aug 18 '10 at 11:28
add a comment |
2 Answers
2
active
oldest
votes
up vote
0
down vote
Are you using the command-line? You should probably install GUI tools such as Tortoise SVN, that will be much easier to understand.
The "svn diff" command-line output is not meant to be read by a human, rather you would feed it into a program which understands that output (typically this program will show you two text editor windows with the old and new files, and would highlight the differences).
Basically, the SVN DIFF output shows you the character and line positions and the text which has changed between the files.
answered Aug 18 '10 at 11:25
RickL
2,19531635
Yes, I'm using command line. I would like to fist understand how command line svn works, and then probably move to tortoiseSVN
– juur
Aug 18 '10 at 11:27
Ok, thanks!....
– juur
Aug 18 '10 at 11:36
@juur: well, the command line works by spitting out a diff, which is designed to be compact and easily parseable by programs, not to be easily readable by humans.
– Michael Borgwardt
Aug 18 '10 at 11:37
@juur: in command line, you can use vimdiff to view the diffs (it is very easily configurable, you have to edit the diff-editor in svn config file)
– Jon
Aug 31 '17 at 9:00
add a comment |
up vote
0
down vote
@juur,
The svn diff command produces this output by comparing your working files against the cached “pristine” copies within the .svn area. Files scheduled for addition are displayed as all added text, and files scheduled for deletion are displayed as all deleted text.
Output is displayed in unified diff format. That is, removed lines are prefaced with -, and added lines are prefaced with +. svn diff also prints filename and offset information useful to the patch program, so you can generate “patches” by redirecting the diff output to a file
You can check more information on how svn diff works in SVN Book.
answered Aug 18 '10 at 12:10
andreyv
795
add a comment |
2 Answers
2
active
oldest
votes
2 Answers
2
active
oldest
votes
active
oldest
votes
active
oldest
votes
up vote
0
down vote
Are you using the command-line? You should probably install GUI tools such as Tortoise SVN, that will be much easier to understand.
The "svn diff" command-line output is not meant to be read by a human, rather you would feed it into a program which understands that output (typically this program will show you two text editor windows with the old and new files, and would highlight the differences).
Basically, the SVN DIFF output shows you the character and line positions and the text which has changed between the files.
answered Aug 18 '10 at 11:25
RickL
2,19531635
Yes, I'm using command line. I would like to fist understand how command line svn works, and then probably move to tortoiseSVN
– juur
Aug 18 '10 at 11:27
Ok, thanks!....
– juur
Aug 18 '10 at 11:36
@juur: well, the command line works by spitting out a diff, which is designed to be compact and easily parseable by programs, not to be easily readable by humans.
– Michael Borgwardt
Aug 18 '10 at 11:37
@juur: in command line, you can use vimdiff to view the diffs (it is very easily configurable, you have to edit the diff-editor in svn config file)
– Jon
Aug 31 '17 at 9:00
add a comment |
up vote
0
down vote
Are you using the command-line? You should probably install GUI tools such as Tortoise SVN, that will be much easier to understand.
The "svn diff" command-line output is not meant to be read by a human, rather you would feed it into a program which understands that output (typically this program will show you two text editor windows with the old and new files, and would highlight the differences).
Basically, the SVN DIFF output shows you the character and line positions and the text which has changed between the files.
answered Aug 18 '10 at 11:25
RickL
2,19531635
Yes, I'm using command line. I would like to fist understand how command line svn works, and then probably move to tortoiseSVN
– juur
Aug 18 '10 at 11:27
Ok, thanks!....
– juur
Aug 18 '10 at 11:36
@juur: well, the command line works by spitting out a diff, which is designed to be compact and easily parseable by programs, not to be easily readable by humans.
– Michael Borgwardt
Aug 18 '10 at 11:37
@juur: in command line, you can use vimdiff to view the diffs (it is very easily configurable, you have to edit the diff-editor in svn config file)
– Jon
Aug 31 '17 at 9:00
add a comment |
up vote
0
down vote
up vote
0
down vote
Are you using the command-line? You should probably install GUI tools such as Tortoise SVN, that will be much easier to understand.
The "svn diff" command-line output is not meant to be read by a human, rather you would feed it into a program which understands that output (typically this program will show you two text editor windows with the old and new files, and would highlight the differences).
Basically, the SVN DIFF output shows you the character and line positions and the text which has changed between the files.
answered Aug 18 '10 at 11:25
RickL
2,19531635
Are you using the command-line? You should probably install GUI tools such as Tortoise SVN, that will be much easier to understand.
The "svn diff" command-line output is not meant to be read by a human, rather you would feed it into a program which understands that output (typically this program will show you two text editor windows with the old and new files, and would highlight the differences).
Basically, the SVN DIFF output shows you the character and line positions and the text which has changed between the files.
answered Aug 18 '10 at 11:25
RickL
2,19531635
edited Aug 18 '10 at 11:31
answered Aug 18 '10 at 11:25
RickL
2,19531635
answered Aug 18 '10 at 11:25
RickL
2,19531635
answered Aug 18 '10 at 11:25
RickL
2,19531635
2,19531635
Yes, I'm using command line. I would like to fist understand how command line svn works, and then probably move to tortoiseSVN
– juur
Aug 18 '10 at 11:27
Ok, thanks!....
– juur
Aug 18 '10 at 11:36
@juur: well, the command line works by spitting out a diff, which is designed to be compact and easily parseable by programs, not to be easily readable by humans.
– Michael Borgwardt
Aug 18 '10 at 11:37
@juur: in command line, you can use vimdiff to view the diffs (it is very easily configurable, you have to edit the diff-editor in svn config file)
– Jon
Aug 31 '17 at 9:00
add a comment |
Yes, I'm using command line. I would like to fist understand how command line svn works, and then probably move to tortoiseSVN
– juur
Aug 18 '10 at 11:27
Ok, thanks!....
– juur
Aug 18 '10 at 11:36
@juur: well, the command line works by spitting out a diff, which is designed to be compact and easily parseable by programs, not to be easily readable by humans.
– Michael Borgwardt
Aug 18 '10 at 11:37
@juur: in command line, you can use vimdiff to view the diffs (it is very easily configurable, you have to edit the diff-editor in svn config file)
– Jon
Aug 31 '17 at 9:00
Yes, I'm using command line. I would like to fist understand how command line svn works, and then probably move to tortoiseSVN
– juur
Aug 18 '10 at 11:27
Yes, I'm using command line. I would like to fist understand how command line svn works, and then probably move to tortoiseSVN
– juur
Aug 18 '10 at 11:27
Ok, thanks!....
– juur
Aug 18 '10 at 11:36
Ok, thanks!....
– juur
Aug 18 '10 at 11:36
@juur: well, the command line works by spitting out a diff, which is designed to be compact and easily parseable by programs, not to be easily readable by humans.
– Michael Borgwardt
Aug 18 '10 at 11:37
@juur: well, the command line works by spitting out a diff, which is designed to be compact and easily parseable by programs, not to be easily readable by humans.
– Michael Borgwardt
Aug 18 '10 at 11:37
@juur: in command line, you can use vimdiff to view the diffs (it is very easily configurable, you have to edit the diff-editor in svn config file)
– Jon
Aug 31 '17 at 9:00
@juur: in command line, you can use vimdiff to view the diffs (it is very easily configurable, you have to edit the diff-editor in svn config file)
– Jon
Aug 31 '17 at 9:00
add a comment |
up vote
0
down vote
@juur,
The svn diff command produces this output by comparing your working files against the cached “pristine” copies within the .svn area. Files scheduled for addition are displayed as all added text, and files scheduled for deletion are displayed as all deleted text.
Output is displayed in unified diff format. That is, removed lines are prefaced with -, and added lines are prefaced with +. svn diff also prints filename and offset information useful to the patch program, so you can generate “patches” by redirecting the diff output to a file
You can check more information on how svn diff works in SVN Book.
answered Aug 18 '10 at 12:10
andreyv
795
add a comment |
up vote
0
down vote
@juur,
The svn diff command produces this output by comparing your working files against the cached “pristine” copies within the .svn area. Files scheduled for addition are displayed as all added text, and files scheduled for deletion are displayed as all deleted text.
Output is displayed in unified diff format. That is, removed lines are prefaced with -, and added lines are prefaced with +. svn diff also prints filename and offset information useful to the patch program, so you can generate “patches” by redirecting the diff output to a file
You can check more information on how svn diff works in SVN Book.
answered Aug 18 '10 at 12:10
andreyv
795
add a comment |
up vote
0
down vote
up vote
0
down vote
@juur,
The svn diff command produces this output by comparing your working files against the cached “pristine” copies within the .svn area. Files scheduled for addition are displayed as all added text, and files scheduled for deletion are displayed as all deleted text.
Output is displayed in unified diff format. That is, removed lines are prefaced with -, and added lines are prefaced with +. svn diff also prints filename and offset information useful to the patch program, so you can generate “patches” by redirecting the diff output to a file
You can check more information on how svn diff works in SVN Book.
answered Aug 18 '10 at 12:10
andreyv
795
@juur,
The svn diff command produces this output by comparing your working files against the cached “pristine” copies within the .svn area. Files scheduled for addition are displayed as all added text, and files scheduled for deletion are displayed as all deleted text.
Output is displayed in unified diff format. That is, removed lines are prefaced with -, and added lines are prefaced with +. svn diff also prints filename and offset information useful to the patch program, so you can generate “patches” by redirecting the diff output to a file
You can check more information on how svn diff works in SVN Book.
answered Aug 18 '10 at 12:10
andreyv
795
answered Aug 18 '10 at 12:10
andreyv
795
answered Aug 18 '10 at 12:10
andreyv
795
answered Aug 18 '10 at 12:10
andreyv
795
795
add a comment |
add a comment |
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function ()
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f3511497%2fsubversion-how-to-interpret-diff-results%23new-answer', 'question_page');
);
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Can you provide screenshots of what you don't understand, that'd be the easiest way to help.
– XstreamINsanity
Aug 18 '10 at 11:23
e.g what this means: @@ -10,6 +10,7 @@
– juur
Aug 18 '10 at 11:28