Menu
I'm using tortoise svn versioning tool and merged code changes from one branch to another. now i want to commit my changes in merged branch.
for some files i am getting status as normal(+)
can anyone tell what this status denotes?
i'm getting status as shown in below picture
555
The svn status command informs you about what has changed in your local repository checkout compared to the moment you first checked it out or last did an update. It does not compare it to the contents of the svn server.
'M' Item has been modified. 'R' Item has been replaced in your working copy. This means the file was scheduled for deletion, and then a new file with the same name was scheduled for addition in its place.
That means the Subversion status is normal. As soon as you start editing a file, the status changes to modified and the icon overlay then changes to a red exclamation mark. That way you can easily see which files were changed since you last updated your working copy and need to be committed.
Yes, C is for conflict. You want: svn resolve --accept mine-full my_sysconfig.ini.
The plus sign tells you that a file or folder has been scheduled to be added to version control.
Edit for updated question:
"The (+) means that TortoiseSVN was able to figure out the item's history, and has added the history metadata to this commit." Meaning you can trace the state of the file in which it used to exist, hence version control. Taken from this post.
More info on status.
193
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
