CODEWITHSUNDEEP
svn
Vlad Krylov
Vlad Krylov

Reputation: 2734

How to know if two commits conflict

I have two local copies of a same repository. How I can check that if I do 'svn commit' from each copy then there will not be conflicts without explicit commit?

Upvotes: 1

Views: 76

Answers (2)

Galled
Galled

Reputation: 4206

In this link there are explanation how to use the command svn status that can show the conflicted files.

Upvotes: 0

sbi
sbi

Reputation: 224039

I'm not sure why you want to know that before checking in. Is it because you are afraid you mess up something by checking in? If so, then rest assured that this won't easily happen by accident.

Once you have committed from one project, you cannot commit (the same files of) the other project unless you update first, in which case you will have to resolve conflicts, should there be any.

If, however, you simply want to know whether changes to two working copies of the same repository will conflict, you can use any diff tool you want, including whatever svn diff invokes. (Note that the latter will work with two local paths, too.)

Upvotes: 1

Related Questions