mirror of https://github.com/apache/openjpa.git
27 lines
1.1 KiB
Batchfile
27 lines
1.1 KiB
Batchfile
@rem
|
|
@rem Licensed to the Apache Software Foundation (ASF) under one
|
|
@rem or more contributor license agreements. See the NOTICE file
|
|
@rem distributed with this work for additional information
|
|
@rem regarding copyright ownership. The ASF licenses this file
|
|
@rem to you under the Apache License, Version 2.0 (the
|
|
@rem "License"); you may not use this file except in compliance
|
|
@rem with the License. You may obtain a copy of the License at
|
|
@rem
|
|
@rem http://www.apache.org/licenses/LICENSE-2.0
|
|
@rem
|
|
@rem Unless required by applicable law or agreed to in writing,
|
|
@rem software distributed under the License is distributed on an
|
|
@rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
@rem KIND, either express or implied. See the License for the
|
|
@rem specific language governing permissions and limitations
|
|
@rem under the License.
|
|
@rem
|
|
|
|
set REPOS=%1
|
|
set FILE=%2
|
|
set VERSION=%3
|
|
set URL=%1/%2
|
|
svn merge %URL%@HEAD %URL%@%VERSION% %FILE%
|
|
|
|
@REM merge svn://domain.com/repo/trunk/folder/changedFile.txt@HEAD svn://domain.com/repo/trunk/folder/changedFile.txt@215 ./folder/changedFile.txt
|