Hi everyone,
On Tue, 8 Jan 2019 at 00:56, Mazo, Andrey wrote:
>
> > git-p4 can map a "git move" operation to a Perforce "move" operation.
> > But by default this is disabled. You then end up with a P4 commit
> > where the file is deleted, and a fresh file is created with the same
> > contents at
Hi,
>From a git-p4 point of view, I see no problems with this change.
Thanks and regards,
Vitor
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On April 22, 2015 9:47:42 PM GMT+01:00, Luke Diamand wrote:
>On 22/04/15 18:11, Junio C Hamano wrote:
>> Vitor Antunes writes:
>>
>>> The updates introduced in the third revision of these two patches
>consist only
>>> on updates to the commit messages to
The updates introduced in the third revision of these two patches consist only
on updates to the commit messages to better clarify what they implement.
Vitor Antunes (2):
t9801: check git-p4's branch detection with client spec enabled
git-p4: improve client path detection when branche
aths will only match if ending in "/...".
Signed-off-by: Vitor Antunes
Signed-off-by: Junio C Hamano
---
git-p4.py| 13 +
t/t9801-git-p4-branch.sh |2 +-
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index 54902
/branch1/...
The test case also includes an extra sub-file mapping to enforce
robustness check of git-p4's client view support:
//depot/branch1/base/dir/sub_file1 //client/branch1/sub_file1
Signed-off-by: Vitor Antunes
Signed-off-by: Junio C Hamano
---
t/t9801-git-p4-branch.sh |
On April 20, 2015 11:45:15 PM GMT+01:00, Junio C Hamano
wrote:
>Vitor Antunes writes:
>
>> On April 20, 2015 6:43:49 AM GMT+01:00, Junio C Hamano
> wrote:
>>>Vitor Antunes writes:
>>>
>>>> Add failing scenario where branch detection is enabled
On April 20, 2015 6:43:49 AM GMT+01:00, Junio C Hamano
wrote:
>Vitor Antunes writes:
>
>> Add failing scenario where branch detection is enabled together with
>> use client view. In this specific scenario git-p4 will break when the
>> perforce client view removes part
Junio C Hamano wrote on Sat, 18 Apr 2015 17:58:11 -0700
> Vitor Antunes writes:
>
>> This patch makes the client path detection more robust by limiting the valid
>> results from p4 where. The test case is also made more complex, to guarantee
>> that such client views are
with "/..." to guarantee that the correct client side path is
identified.
Vitor Antunes (2):
t9801: check git-p4's branch detection and client view together
git-p4: improve client path detection when branches are used
git-p4.py| 13 --
t/t9801-git
implementation.
Signed-off-by: Vitor Antunes
Signed-off-by: Junio C Hamano
---
t/t9801-git-p4-branch.sh | 106 ++
1 file changed, 106 insertions(+)
diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh
index 2bf142d..36a7f51 100755
--- a/t/t9801-git-p4
exist in the
git repository.
2. Search for mappings that contain the depot path, instead
of requiring an exact match. To guarantee robustness,
paths only match if ending in "/...".
Signed-off-by: Vitor Antunes
Signed-off-by: Junio C Hamano
---
git-p4.py| 13
This patch makes the client path detection more robust by limiting the valid
results from p4 where. The test case is also made more complex, to guarantee
that such client views are supported.
Signed-off-by: Vitor Antunes
---
git-p4.py|4 +++-
t/t9801-git-p4-branch.sh | 12
Hi Junio,
Junio C Hamano wrote on Sun, 12 Apr 2015 20:40:58 -0700
> Vitor Antunes writes:
>> Luke Diamand wrote on Sun, 05 Apr 2015 20:27:11 +0100
>>> Vitor, one thing I wondered about with this part of the change:
>>>
>>> -if entry["depo
lelog".
* Remove all "case" statements and replace them with simple tests to check
that source is "file2".
Signed-off-by: Vitor Antunes
Acked-by: Luke Diamand
---
t/t9814-git-p4-rename.sh | 46 +++---
1 file changed, 31 insertions(+),
Luke Diamand wrote on Sun, 05 Apr 2015 20:27:11 +0100
> On 28/03/15 12:28, Vitor Antunes wrote:
> > I'm adding a test case for a scenario I was confronted with when using
> > branch
> > detection and a client view specification. It is possible that the
> > imple
* Modify source file (file2) before copying the file.
* Check that only file2 is the source in the output of "p4 filelog".
* Remove all "case" statements and replace them with simple tests to check
that source is "file2".
Signed-off-by: Vitor Antunes
---
t
* Modify source file (file2) before copying the file.
* Check that only file2 is the source in the output of "p4 filelog".
* Remove all "case" statements and replace them simple tests to check that
source is "file2".
Signed-off-by: Vitor Antunes
---
t
Add failing scenario where using branch detection and a client view will break
git p4 submit functionality.
Signed-off-by: Vitor Antunes
---
t/t9801-git-p4-branch.sh | 98 ++
1 file changed, 98 insertions(+)
diff --git a/t/t9801-git-p4-branch.sh b
n the git repository.
2. Search for mappings that contain the depot path, instead of requiring an
exact match.
Signed-off-by: Vitor Antunes
---
git-p4.py| 11 +++
t/t9801-git-p4-branch.sh |2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/git-p4.
I'm adding a test case for a scenario I was confronted with when using branch
detection and a client view specification. It is possible that the implemented
fix may not cover all possible scenarios, but there is no regression in the
available tests.
Vitor Antunes (2):
git-p4: Check b
Vitor Antunes wrote:
>Junio C Hamano wrote:
>>Pete, these tests blame to your 9b6513ac (git p4 test: split up big
>>t9800 test, 2012-06-27). I presume that you tested the result of
>>this splitting, but do you happen to know if we did something to
>>cause the test t
file11, as
was done in other tests in this file.
Signed-off-by: Vitor Antunes
---
t/t9814-git-p4-rename.sh |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/t/t9814-git-p4-rename.sh b/t/t9814-git-p4-rename.sh
index efae143..8b9c295 100755
--- a/t/t9814-git-p4-rename.sh
+++ b
Signed-off-by: Vitor Antunes
---
t/t9814-git-p4-rename.sh |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t9814-git-p4-rename.sh b/t/t9814-git-p4-rename.sh
index 95f4421..efae143 100755
--- a/t/t9814-git-p4-rename.sh
+++ b/t/t9814-git-p4-rename.sh
@@ -180,7 +180,7
1 patch
that no longer makes much sense to me.
Vitor Antunes (2):
git-p4: Make rename test case runnable under dash
git-p4: Fix copy detection test
t/t9814-git-p4-rename.sh |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
--
1.7.10.4
--
To unsubscribe from this list: s
Junio C Hamano wrote:
>Vitor Antunes writes:
>
>> File file11 is copied from file2 and diff-tree correctly reports this file as
>> its the source, but the test expression was checking for file10 instead
>> (which
>> was a file that also originated from file2). It
On Fri, 27 Mar 2015 at 01:26 Junio C Hamano wrote:
>As to 1/2 the lack of esac is clearly a bug---any self respecting
>POSIX shell should have executed it without complaining. But
>changing from ':' to true should not be necessary---after all, the
>colon is a more traditional way to spell true to
this mismatch in
behavior.
Signed-off-by: Vitor Antunes
---
t/t9814-git-p4-rename.sh |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t9814-git-p4-rename.sh b/t/t9814-git-p4-rename.sh
index 24008ff..018f01d 100755
--- a/t/t9814-git-p4-rename.sh
+++ b/t/t9814-git-p4
Signed-off-by: Vitor Antunes
---
t/t9814-git-p4-rename.sh |8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t9814-git-p4-rename.sh b/t/t9814-git-p4-rename.sh
index 95f4421..24008ff 100755
--- a/t/t9814-git-p4-rename.sh
+++ b/t/t9814-git-p4-rename.sh
@@ -178,9
This patch set includes two small fixes to the rename test case. The fix to
support dash should be trivial, but in the fix to the copy detection test case
it isn't obvious to me what changed in diff-tree to result in a different file
being detected as the origin of a copy.
Vitor Antun
On Sat, Jul 20, 2013 at 2:48 PM, Pete Wyckoff wrote:
> I'd forgotten during your conversation with Matthieu that we
> did indeed have tests for detect-branches with use-client-spec.
> This test sure seems like it should cover that situation though.
It was good that you had some tests implemented,
This test confirms that a file can be ignored during git p4 sync if if is
excluded in P4 client specification.
Signed-off-by: Vitor Antunes
---
t/t9801-git-p4-branch.sh | 23 ---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/t/t9801-git-p4-branch.sh b/t
On Mon, Jul 8, 2013 at 3:03 PM, Matthieu Brucher
wrote:
> Hi,
>
> I tried without spec, but then it tried importing everything, even
> though there was a .gitignore and a .git/config/exclude file.
> Then, it crashed during the importation because it could find an old
> branch (I don't have access
On Mon, Jul 8, 2013 at 12:10 PM, Matthieu Brucher
wrote:
> Without the spec client, it seems that the branches are recognized,
> but there are some many binary files that I need to remove them during
> the migration.
> I tried setting a .gitignore beforehand, but it is not respected (I
> tried to
On Mon, Jul 8, 2013 at 11:09 AM, Matthieu Brucher
wrote:
> Hi again,
>
> I tried with @all, but it didn'y work as expected. It imported a bunch
> of revisions (but no files?) and ended with:
> Reading pipe: ['git', 'config', '--bool', 'git-p4.importLabels']
> Not checking out any branch, use "
On Fri, Jul 5, 2013 at 7:11 PM, Matthieu Brucher
wrote:
>> Hi Matthieu,
>>
>> Could you please try using //Depot/Projectall instead of selecting a
>> specific revision?
>
> I can try. Indeed, at this revision, the two other branches do not yet
> exist. But @all will get everything? Last time, I on
Matthieu Brucher gmail.com> writes:
>
> Hi,
>
> I'm trying to convert a Perforce repository to git, knowing that:
> - I use client specs to remove a bunch of folders containing binaires
> (several GiB)
> - branch mappings may not be properly set, and I can't change them
>
> Now, the branches ar
On Mon, Nov 5, 2012 at 5:57 PM, Pete Wyckoff wrote:
> vitor@gmail.com wrote on Mon, 05 Nov 2012 17:37 +:
>> Hi Pete,
>>
>> I've just been hit by a situation where this command is available but is
>> disabled in the server. I don't know what is the best approach to avoid
>> this issue.
>
>
Arthur amesys.fr> writes:
>
> In ~/.gitconfig i've :
>
> [user]
> name = Arthur
> email = a.x x.fr
> [git-p4]
> branchList = MAINLINE:DEV_DATA
> branchList = MAINLINE:RELEASE_1.0
> branchList = MAINLINE:RELEASE_1.0.0
>
> it's ok ?
> So :
>
> /#
Arthur amesys.fr> writes:
>
> Thanks for your support,
>
> If i get latest révision on Perforce i have this errors :
>
> /590 errors reported
> Librarian checkout
> depot/mainline/02_subsystem/10_arinc_429/00_cots/01_bsp_aim/original
> files/api429decryption.txt failed.
> open for
On Mon, 5 Nov 2012 17:12:12 -0500
Pete Wyckoff wrote:
> Thanks, that is interesting output.
>
> Adding Vitor who knows his way around the branch detection
> code. The first mail by Arthur is here, which focuses more
> on the backtrace from "p4 describe" errors, but also suggests
> something is
Pete Wyckoff padd.com> writes:
>
> From: Gary Gibbons perforce.com>
>
> For -M option (detectRenames) in P4Submit, use 'p4 move' rather
> than 'p4 integrate'. Check Perforce server for exisitence of
> 'p4 move' and use it if present, otherwise revert to 'p4 integrate'.
>
Hi Pete,
I've just
42 matches
Mail list logo
