Package org.tmatesoft.svn.core

Examples of org.tmatesoft.svn.core.SVNProperties.clear()

3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
            revertBase = true;
            baseProperties = dir.getRevertProperties(name);
            String propRevertPath = SVNAdminUtil.getPropRevertPath(name, entry.getKind(), false);
            command.put(SVNLog.NAME_ATTR, propRevertPath);
            log.addCommand(SVNLog.DELETE, command, false);
            command.clear();
            reverted = true;
        }
        boolean reinstallWorkingFile = false;
        if (baseProperties == null) {
            if (dir.hasPropModifications(name)) {
View Full Code Here
500
501
502
503
504
505
506
507
508
509
510
            String detranslatedPath = files.getWCPath();
            if (log != null) {
                command.put(SVNLog.NAME_ATTR, copyFromPath);
                command.put(SVNLog.DEST_ATTR, detranslatedPath);
                log.addCommand(SVNLog.COPY_AND_TRANSLATE, command, false);
                command.clear();
            }
        }

        File mineFile = SVNFileUtil.createUniqueFile(root, files.getWCPath(), files.getLocalLabel(), false);
        File oldFile = SVNFileUtil.createUniqueFile(root, files.getWCPath(), files.getBaseLabel(), false);
View Full Code Here
523
524
525
526
527
528
529
530
531
532
533
        if (log != null) {
            command.put(SVNLog.NAME_ATTR, basePath);
            command.put(SVNLog.DEST_ATTR, oldPath);
            command.put(SVNLog.ATTR2, files.getWCPath());
            log.addCommand(SVNLog.COPY_AND_TRANSLATE, command, false);
            command.clear();

            command.put(SVNLog.NAME_ATTR, latestPath);
            command.put(SVNLog.DEST_ATTR, newPath);
            command.put(SVNLog.ATTR2, files.getWCPath());
            log.addCommand(SVNLog.COPY_AND_TRANSLATE, command, false);
View Full Code Here
529
530
531
532
533
534
535
536
537
538
539
            command.put(SVNLog.NAME_ATTR, latestPath);
            command.put(SVNLog.DEST_ATTR, newPath);
            command.put(SVNLog.ATTR2, files.getWCPath());
            log.addCommand(SVNLog.COPY_AND_TRANSLATE, command, false);
            command.clear();

            command.put(SVNLog.NAME_ATTR, tmpTargetCopyPath);
            command.put(SVNLog.DEST_ATTR, minePath);
            command.put(SVNLog.ATTR2, files.getWCPath());
            log.addCommand(SVNLog.COPY_AND_TRANSLATE, command, false);
View Full Code Here
535
536
537
538
539
540
541
542
543
544
545
            command.put(SVNLog.NAME_ATTR, tmpTargetCopyPath);
            command.put(SVNLog.DEST_ATTR, minePath);
            command.put(SVNLog.ATTR2, files.getWCPath());
            log.addCommand(SVNLog.COPY_AND_TRANSLATE, command, false);
            command.clear();

            if (!tmpTargetCopy.equals(files.getLocalFile())) {
                command.put(SVNLog.NAME_ATTR, tmpTargetCopyPath);
                log.addCommand(SVNLog.DELETE, command, false);
                command.clear();
View Full Code Here
540
541
542
543
544
545
546
547
548
549
550
            command.clear();

            if (!tmpTargetCopy.equals(files.getLocalFile())) {
                command.put(SVNLog.NAME_ATTR, tmpTargetCopyPath);
                log.addCommand(SVNLog.DELETE, command, false);
                command.clear();
            }

            command.put(SVNLog.NAME_ATTR, files.getResultPath());
            command.put(SVNLog.DEST_ATTR, files.getWCPath());
            command.put(SVNLog.ATTR2, files.getWCPath());
View Full Code Here
547
548
549
550
551
552
553
554
555
556
557
            command.put(SVNLog.NAME_ATTR, files.getResultPath());
            command.put(SVNLog.DEST_ATTR, files.getWCPath());
            command.put(SVNLog.ATTR2, files.getWCPath());
            log.addCommand(SVNLog.COPY_AND_TRANSLATE, command, false);
            command.clear();
        }

        makeTextConflictEntry(files, minePath, newPath, oldPath);
       
        return SVNMergeResult.createMergeResult(SVNStatusType.CONFLICTED, null);
View Full Code Here
563
564
565
566
567
568
569
570
571
572
573
            SVNProperties command = new SVNProperties();
            command.put(SVNProperty.shortPropertyName(SVNProperty.CONFLICT_WRK), mineFilePath);
            command.put(SVNProperty.shortPropertyName(SVNProperty.CONFLICT_NEW), newFilePath);
            command.put(SVNProperty.shortPropertyName(SVNProperty.CONFLICT_OLD), oldFilePath);
            log.logChangedEntryProperties(files.getWCPath(), command);
            command.clear();
        }
    }
   
    protected SVNMergeResult handleChooseMerged(SVNMergeFileSet files, SVNMergeResult mergeResult) throws SVNException {
        SVNProperties command = new SVNProperties();
View Full Code Here
577
578
579
580
581
582
583
584
585
586
587
            if (mergeResult.getMergeStatus() != SVNStatusType.UNCHANGED) {
                if (log != null) {
                    command.put(SVNLog.NAME_ATTR, files.getResultPath());
                    command.put(SVNLog.DEST_ATTR, files.getWCPath());
                    log.addCommand(SVNLog.COPY_AND_TRANSLATE, command, false);
                    command.clear();
                }
            }
            return mergeResult;
        } else if (files.isBinary()) {
            // this action is not applicable for binary conflited files.
View Full Code Here
590
591
592
593
594
595
596
597
598
599
600
            if (log != null) {
                // for text file we could use merged version in case of conflict.
                command.put(SVNLog.NAME_ATTR, files.getResultPath());
                command.put(SVNLog.DEST_ATTR, files.getWCPath());
                log.addCommand(SVNLog.COPY_AND_TRANSLATE, command, false);
                command.clear();
            }
            return SVNMergeResult.createMergeResult(SVNStatusType.MERGED, null);
        }
    }
View Full Code Here
TOP
Copyright © 2018 www.massapi.com. All rights reserved.
All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.