¿Qué indica el estado normal (+) en svn?

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

enter image description here

preguntado el 27 de noviembre de 13 a las 05:11

2 Respuestas

The plus sign tells you that a file or folder has been scheduled to be added to version control.

Editar para pregunta actualizada:

"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 este enviar.

MÁS INFORMACIÓN sobre el estado

Respondido el 20 de junio de 20 a las 10:06

what is the difference between added(+) and normal(+)? - RobertoRey

Added means it is scheduled to be added to version control and normal means it is a fresh, checked-out working copy. The link I provided on the bottom explains the different status in subversion. - Dan

I don't think the previous answer was correct on added(+) vs normal(+). If I merge a folder from one branch to another, the folder's status is "added (+)" but the children files of that folder have a status of "normal (+)". But they are all being added just as their parent folder is being added. So why does SVN use added vs normal? - Webs para desarrolladores

Dan's answer is correct. And to add information for Developer Webs' question:

If I merge a folder from one branch to another, the folder's status is "added (+)" but the children files of that folder have a status of "normal (+)". But they are all being added just as their parent folder is being added. So why does SVN use added vs normal?

Los archivos con normal(+) will be added to the commit, but you don't need to check it for committing. As the parent folder has an added(+) status, it will be included recursively. Also, no transfer from your local copy to the server will be done, as the file is already on the server.

Además, hay un modified(+) status: it means that after the merge brought the file you made some changes to it. So, it must be checked to be committed with this new changes.

EL deleted(+) status means that the file was brought from the merge but you later deleted it. It must be commited.

Respondido 06 Abr '19, 18:04

No es la respuesta que estás buscando? Examinar otras preguntas etiquetadas or haz tu propia pregunta.