All geek questions in one place

Svn diff between previous and new working copy

Suppose I made some changes since the last update (check back) to my ab file, this ab file also changes in the repository. Now I want to compare the changes I made with the repos.

If I svn returned the file, I can see the changes between the new and the previous download (the previous download does not have my changes). How to see the differences between the repository changes and mine?

thanks

+4
source share
2 answers

svn diff -r HEAD ab

I think you need to specify a HEAD revision if something changes in the repository.

But now, when I re-read your question, it looks like you:
made changes
made a change
now I want to view these changes

In this case, you can get the current version number with

svn info ab

subtract 1 from it and use it in svn diff.

for example if your current revision is 100

svn diff -r 99: 100

+7
source

If you use Subclipse in Eclipse, it marks the file as a conflict, and when you double-click on the conflicting file, it will show you your local file on one side and the repositiry file on the right.

Conflicts are marked in red and you can easily accept the changes or mark them as merged.

For more information: http://subclipse.tigris.org/

+1
source

Source: https://habr.com/ru/post/1397854/

More articles:


All Articles