Hi Kamesh,

Here is the new patch and log message and the .tar.bz2 file.

Regards,
Arwin Arni
Arwin,

Sorry, I guess my description can be reduced to even simple form.

I mean we do not need *failed commit* condition, just scheduled change alone is enough.

Can you provide a new patch which covers the following case?

cd /tmp
cd svn-1.6 co file:///repo/abc
touch abc/test
svn-1.6 add abc/test
svn-1.7 upgrade


With regards
Kamesh Jayachandran
On 12/31/2010 02:58 PM, Arwin Arni wrote:
On Thursday 30 December 2010 09:35 PM, Kamesh Jayachandran wrote:
Hi All,

I did the following.

cd /tmp
cd svn-1.6 co file:///repo/abc
touch abc/test
svn-1.6 add abc/test
#Make sure below commit fails either by a pre-commit hook or File system perm error, we just need this to fail.

svn-1.6 ci -m "msg"

svn-1.7 upgrade
Segfaults

My svn-1.7 trunk build corresponds to 1053813:1053833

With regards
Kamesh Jayachandran
Hi Kamesh,

I've written an XFail test case which reproduces this Seg Fault in upgrade_tests.py

I've attached the patch + log message and also a .tar.bz2 file to be added to
subversion/tests/cmdline/upgrade_tests_data/

Regards,
Arwin Arni



Attachment: upgrade_with_scheduled_change.tar.bz2
Description: application/bzip

Index: subversion/tests/cmdline/upgrade_tests.py
===================================================================
--- subversion/tests/cmdline/upgrade_tests.py   (revision 1053802)
+++ subversion/tests/cmdline/upgrade_tests.py   (working copy)
@@ -831,6 +831,16 @@
       [sbox.ospath('B/f'), '958eb2d755df2d9e0de6f7b835aec16b64d83f6f'],
       [sbox.ospath('B/g'), '395dfb603d8a4e0348d0b082803f2b7426c76eb9']])
 
+def upgrade_with_scheduled_change(sbox):
+  "upgrade 1.6.x wc with a scheduled change"
+  
+  sbox.build(create_wc = False)
+  replace_sbox_with_tarfile(sbox, 'upgrade_with_scheduled_change.tar.bz2')
+
+  svntest.actions.run_and_verify_svn(None, None, [],
+                                     'upgrade', sbox.wc_dir)
+  
+   
 ########################################################################
 # Run the tests
 
@@ -855,6 +865,7 @@
               upgrade_tree_conflict_data,
               delete_in_copy_upgrade,
               replaced_files,
+              XFail(upgrade_with_scheduled_change),
              ]
 
 
[[[
Adds an XFail test of wc-upgrade(1.6-wc+scheduled_change to 1.7-wc)

* 
subversion/tests/cmdline/upgrade_tests_data/upgrade_with_scheduled_change.tar.bz2
  New file.

* subversion/tests/cmdline/upgrade_tests.py
  (upgrade_with_scheduled_change): New XFail testcase.

Patch by: Arwin Arni <arwin{_AT_}collab.net>
]]]

Reply via email to