create patch oddities

I'm currently trying to integrate a part of a change set i've been working on for quite a while now.

I don't want to checkin everything yet so i've done a fresh checkout from the trunk of my project (in subversion) in another folder, and am creating patches from the "former working copy" and applying them in the new one.

I've done two already, which seem to have worked fine, without noticing anything strange. THose changes only included file MODIFICATIONS, no file CREATION.

THen I tried to create a new one, this time containing file creations. The patch was created but when i want to apply it the files are red in the dialog, and it seems the patch was created with a wrong root (which was also true for the previously created patches which worked anyway, no idea how).

My former project content root is c:\mks\svn
My new project root is c:\mks\trunk

problem is the patch created include the svn token, which I don't think it should right ?
I didn't find anywhere to set the "root folder" i want to be used for creating the patch.

Am I doing something wrong ? or is there a bug somewhere ?

3 comments
Comment actions Permalink

Hello Thibaut,

The patch files contain relative file paths. By default, when creating patches,
the paths are written relative to the directory containing the .ipr file.
The "Strip leading directories" option in the Apply Patch dialog can be used
to ignore some leading segments of relative paths in the patch files.

Also note that if the created files are in new directories, the paths will
be red in the Apply Patch dialog, and you'll be prompted to create the directories
when you close the dialog.

By the way, you can use Shelve Changes instead of doing a clean checkout
and moving changes manually.

I'm currently trying to integrate a part of a change set i've been
working on for quite a while now.

I don't want to checkin everything yet so i've done a fresh checkout
from the trunk of my project (in subversion) in another folder, and am
creating patches from the "former working copy" and applying them in
the new one.

I've done two already, which seem to have worked fine, without
noticing anything strange. THose changes only included file
MODIFICATIONS, no file CREATION.

THen I tried to create a new one, this time containing file creations.
The patch was created but when i want to apply it the files are red in
the dialog, and it seems the patch was created with a wrong root
(which was also true for the previously created patches which worked
anyway, no idea how).

My former project content root is c:\mks\svn
My new project root is c:\mks\trunk
problem is the patch created include the svn token, which I don't
think it should right ? I didn't find anywhere to set the "root
folder" i want to be used for creating the patch.

Am I doing something wrong ? or is there a bug somewhere ?

--
Dmitry Jemerov
Software Developer
JetBrains, Inc.
http://www.jetbrains.com/
"Develop with Pleasure!"


0
Comment actions Permalink

Indeed, i missed that "strip leading directories" , was looking for something like it in the Create Patch instead.

My problem with the shelve changes is some of the files have been affected by multiple changes, and I don't know the Shelve Changes feature handles this, or does it ?

Btw, you're very fast to answer ! really helpful

0
Comment actions Permalink

Hello Thibaut,

My problem with the shelve changes is some of the files have been
affected by multiple changes, and I don't know the Shelve Changes
feature handles this, or does it ?


Currently it does not: it saves and reverts all changes within a file. So
indeed, in that case you'll have to move the changes manually.

--
Dmitry Jemerov
Software Developer
JetBrains, Inc.
http://www.jetbrains.com/
"Develop with Pleasure!"


0

Please sign in to leave a comment.