Re: Aggregated diffs and added files

2010-12-10 Thread Sasha O
Vincent --


Thanks for your reply. Before writing to the group I have tried
post-review with the similar results.


But now a strange thing happened -- I cannot reproduce this problem.
Both post-review and manual upload work fine now on this changeset
(hope it's the same changeset).


I will keep my eyes open and if/when the probem comes back I will try
to reproduce it, make sure I can re-apply the diff and write again.


I am using ReviewBoard 1.5.


Thanks,
-- Sasha


On Thursday, December 9, 2010 2:51:04 PM UTC-8, Christian Hammond
wrote:Without seeing the diff, it's a little hard to say. However, the
end
result must be a diff that can be applied to a working tree, and each
file listed in the diff must contain either a revision that along with
the filename can be fetched individually from an SVN server
(therefore, it must exist) or be marked as a new file (which I suspect
it's not, from the merge).
Basically, if you have a diff that says this one file is based on
revision XYZ at this location, and the SVN server can't look up that
revision at that path, we can't display the diff. There's not much we
can do about that there from Review Board's side.

What I'd recommend is using our post-review command instead of svn
diff. It handles some things like renames and fixing up file paths in
the diffs before sending to Review Board. Hopefully it will fix your
case.

Christian

--
Christian Hammond - chi...@chipx86.com
Review Board - http://www.reviewboard.org
VMware, Inc. - http://www.vmware.com



On Thu, Dec 9, 2010 at 8:25 AM, Sasha O sash...@gmail.com wrote:
 To clarify: my problem is that if a file was a new file created in one
 of the revisions then
 ReviewBoard barks at this file with the message The file 'https://
 repo/myfile1' (r
 $first-rev-1) could not be found in the repository and doesn't
create review request.

 I am stuck and cannot use ReviewBoard.

 Thanks for any insight.
 -- Sasha

 On Dec 6, 11:02 am, Sasha O sash...@gmail.com wrote:
 Dear All --

 I am trying to create review for a bunch of changes. These changes
 involved adding new files. The way I am doing this is:

 svn up -r $first-rev-1
 svn merge -c $first-rev .
 svn merge -c $second-rev .
 A myfile1
 ...
 svn diff  bunch.diff

 create review request in the Web UI by uploading bunch.diff

 I am getting error message like The file 'https://repo/myfile1' (r
 $first-rev-1) could not be found in the repository

 I am doing something wrong? What is the way around this?

 Thanks in advance,
 -- Sasha

 --
 Want to help the Review Board project? Donate today at
http://www.reviewboard.org/donate/
 Happy user? Let us know at http://www.reviewboard.org/users/
 -~--~~~~--~~--~--~---
 To unsubscribe from this group, send email to
reviewboard...@googlegroups.com
 For more options, visit this group at
http://groups.google.com/group/reviewboard?hl=en

-- 
Want to help the Review Board project? Donate today at 
http://www.reviewboard.org/donate/
Happy user? Let us know at http://www.reviewboard.org/users/
-~--~~~~--~~--~--~---
To unsubscribe from this group, send email to 
reviewboard+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/reviewboard?hl=en

Re: Aggregated diffs and added files

2010-12-09 Thread Christian Hammond
Without seeing the diff, it's a little hard to say. However, the end
result must be a diff that can be applied to a working tree, and each
file listed in the diff must contain either a revision that along with
the filename can be fetched individually from an SVN server
(therefore, it must exist) or be marked as a new file (which I suspect
it's not, from the merge).

Basically, if you have a diff that says this one file is based on
revision XYZ at this location, and the SVN server can't look up that
revision at that path, we can't display the diff. There's not much we
can do about that there from Review Board's side.

What I'd recommend is using our post-review command instead of svn
diff. It handles some things like renames and fixing up file paths in
the diffs before sending to Review Board. Hopefully it will fix your
case.

Christian

--
Christian Hammond - chip...@chipx86.com
Review Board - http://www.reviewboard.org
VMware, Inc. - http://www.vmware.com



On Thu, Dec 9, 2010 at 8:25 AM, Sasha O sasha...@gmail.com wrote:
 To clarify: my problem is that if a file was a new file created in one
 of the revisions then
 ReviewBoard barks at this file with the message The file 'https://
 repo/myfile1' (r
 $first-rev-1) could not be found in the repository and doesn't create 
 review request.

 I am stuck and cannot use ReviewBoard.

 Thanks for any insight.
 -- Sasha

 On Dec 6, 11:02 am, Sasha O sasha...@gmail.com wrote:
 Dear All --

 I am trying to create review for a bunch of changes. These changes
 involved adding new files. The way I am doing this is:

     svn up -r $first-rev-1
     svn merge -c $first-rev .
     svn merge -c $second-rev .
       A myfile1
     ...
     svn diff  bunch.diff

     create review request in the Web UI by uploading bunch.diff

 I am getting error message like The file 'https://repo/myfile1' (r
 $first-rev-1) could not be found in the repository

 I am doing something wrong? What is the way around this?

 Thanks in advance,
 -- Sasha

 --
 Want to help the Review Board project? Donate today at 
 http://www.reviewboard.org/donate/
 Happy user? Let us know at http://www.reviewboard.org/users/
 -~--~~~~--~~--~--~---
 To unsubscribe from this group, send email to 
 reviewboard+unsubscr...@googlegroups.com
 For more options, visit this group at 
 http://groups.google.com/group/reviewboard?hl=en

-- 
Want to help the Review Board project? Donate today at 
http://www.reviewboard.org/donate/
Happy user? Let us know at http://www.reviewboard.org/users/
-~--~~~~--~~--~--~---
To unsubscribe from this group, send email to 
reviewboard+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/reviewboard?hl=en


Re: Aggregated diffs and added files

2010-12-09 Thread Vincent
Hi.actually I have the same problem.but maybe it is because I have am still 
using the beta version

Sent using a Sony Ericsson mobile phone


 Original message 
From: Christian Hammond chip...@chipx86.com
Sent: 
To: reviewboard@googlegroups.com
Subject: Re: Aggregated diffs and added files

Without seeing the diff, it's a little hard to say. However, the end
result must be a diff that can be applied to a working tree, and each
file listed in the diff must contain either a revision that along with
the filename can be fetched individually from an SVN server
(therefore, it must exist) or be marked as a new file (which I suspect
it's not, from the merge).

Basically, if you have a diff that says this one file is based on
revision XYZ at this location, and the SVN server can't look up that
revision at that path, we can't display the diff. There's not much we
can do about that there from Review Board's side.

What I'd recommend is using our post-review command instead of svn
diff. It handles some things like renames and fixing up file paths in
the diffs before sending to Review Board. Hopefully it will fix your
case.

Christian

--
Christian Hammond - chip...@chipx86.com
Review Board - http://www.reviewboard.org
VMware, Inc. - http://www.vmware.com



On Thu, Dec 9, 2010 at 8:25 AM, Sasha O sasha...@gmail.com wrote:
 To clarify: my problem is that if a file was a new file created in one
 of the revisions then
 ReviewBoard barks at this file with the message The file 'https://
 repo/myfile1' (r
 $first-rev-1) could not be found in the repository and doesn't create 
 review request.

 I am stuck and cannot use ReviewBoard.

 Thanks for any insight.
 -- Sasha

 On Dec 6, 11:02 am, Sasha O sasha...@gmail.com wrote:
 Dear All --

 I am trying to create review for a bunch of changes. These changes
 involved adding new files. The way I am doing this is:

     svn up -r $first-rev-1
     svn merge -c $first-rev .
     svn merge -c $second-rev .
       A myfile1
     ...
     svn diff  bunch.diff

     create review request in the Web UI by uploading bunch.diff

 I am getting error message like The file 'https://repo/myfile1' (r
 $first-rev-1) could not be found in the repository

 I am doing something wrong? What is the way around this?

 Thanks in advance,
 -- Sasha

 --
 Want to help the Review Board project? Donate today at 
 http://www.reviewboard.org/donate/
 Happy user? Let us know at http://www.reviewboard.org/users/
 -~--~~~~--~~--~--~---
 To unsubscribe from this group, send email to 
 reviewboard+unsubscr...@googlegroups.com
 For more options, visit this group at 
 http://groups.google.com/group/reviewboard?hl=en

-- 
Want to help the Review Board project? Donate today at 
http://www.reviewboard.org/donate/
Happy user? Let us know at http://www.reviewboard.org/users/
-~--~~~~--~~--~--~---
To unsubscribe from this group, send email to 
reviewboard+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/reviewboard?hl=en

-- 
Want to help the Review Board project? Donate today at 
http://www.reviewboard.org/donate/
Happy user? Let us know at http://www.reviewboard.org/users/
-~--~~~~--~~--~--~---
To unsubscribe from this group, send email to 
reviewboard+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/reviewboard?hl=en