Test case to prove - merge past to head with renamed dir

Hi,

I am attaching a patch along with this mail to implement a
test case as 
described in htt
p://svn.haxx.se/dev/archive-2007-09/0706.shtml

[[[
Merge past to head with renamed dir - test case

  See htt
p://svn.haxx.se/dev/archive-2007-09/0706.shtml

    * subversion/tests/cmdline/merge_tests.py
      (merge_past_to_head_with_renamed_dir): New function.
      (test_list): Add 'merge_past_to_head_with_renamed_dir'
to test_list

Patch by: Senthil krishnaan <senthilcollab.net>
Suggested by: lgo
               kameshj
]]]

Thank You.

--
Senthil krishnaan S
http://www.stylesen.org/


------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscribesubversion.tigris.org
For additional commands, e-mail: dev-helpsubversion.tigris.org

Senthil,
Thanks for the patch(I renamed the function and reworded the
doc string) 
committed at r26829.

Can you write a single file merge version of the same? I
remember 
finding one regression last week by going through the code,
which could 
have been caught early if we had the testcase.

Thanks

With regards
Kamesh Jayachandran


Senthil krishnaan S wrote:
> Hi,
>
> I am attaching a patch along with this mail to
implement a test case 
> as described in htt
p://svn.haxx.se/dev/archive-2007-09/0706.shtml
>
> [[[
> Merge past to head with renamed dir - test case
>
>  See htt
p://svn.haxx.se/dev/archive-2007-09/0706.shtml
>
>    * subversion/tests/cmdline/merge_tests.py
>      (merge_past_to_head_with_renamed_dir): New
function.
>      (test_list): Add
'merge_past_to_head_with_renamed_dir' to test_list
>
> Patch by: Senthil krishnaan <senthilcollab.net>
> Suggested by: lgo
>               kameshj
> ]]]
>
> Thank You.
>
> -- 
> Senthil krishnaan S
> http://www.stylesen.org/

>
------------------------------------------------------------
------------
>
>
------------------------------------------------------------
---------
> To unsubscribe, e-mail: dev-unsubscribesubversion.tigris.org
> For additional commands, e-mail: dev-helpsubversion.tigris.org

------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscribesubversion.tigris.org
For additional commands, e-mail: dev-helpsubversion.tigris.org

Hi Kamesh,

Kamesh Jayachandran wrote:
> Can you write a single file merge version of the same?
I remember 
> finding one regression last week by going through the
code, which could 
> have been caught early if we had the testcase.

I ve submitted a patch 
(htt
p://svn.haxx.se/dev/archive-2007-10/0174.shtml), please
have a look 
at it and let me know if there is any changes.

Thank You.

--
Senthil krishnaan S
http://www.stylesen.org/


------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscribesubversion.tigris.org
For additional commands, e-mail: dev-helpsubversion.tigris.org