hal9000
da919f9f6e
Resolved merge conflicts: - CMakeLists.txt: Added both rebase_engine/utility and base64_util sources - src/harness.cpp: Combined Content type with proper error handling - src/main.cpp: Merged includes, test flags, and CLI parsing - Renamed conflicting flags: -B→-Z (build_rebase), -T→-W (edit_prompt), -b→-K (base64_decode) - tests/CMakeLists.txt: Added all test targets from both branches - src/rebase_engine.cpp: Fixed to use get_content_string() for Content variant type - Updated test files to use new flag names (-Z, -W, -K)
28 lines
775 B
Bash
Executable File
28 lines
775 B
Bash
Executable File
#!/bin/bash
|
|
# test_rebase_content_scissors_line.sh - Test scissors line separates comments from commands
|
|
|
|
test_name="scissors_line"
|
|
|
|
json=$(create_messages_json user "test")
|
|
|
|
OUTPUT=$("${DRHARNESS}" -Z "$json")
|
|
|
|
# Check for scissors line
|
|
if ! echo "$OUTPUT" | grep -q -- "-- >8 --"; then
|
|
echo "FAIL: $test_name - missing scissors line"
|
|
echo "Got: $OUTPUT"
|
|
exit 1
|
|
fi
|
|
|
|
# Check that scissors line appears before pick commands
|
|
scissors_line=$(echo "$OUTPUT" | grep -n -- "-- >8 --" | head -1 | cut -d: -f1)
|
|
pick_line=$(echo "$OUTPUT" | grep -n "^pick" | head -1 | cut -d: -f1)
|
|
|
|
if [ "$scissors_line" -ge "$pick_line" ]; then
|
|
echo "FAIL: $test_name - scissors line should appear before pick commands"
|
|
echo "Got: $OUTPUT"
|
|
exit 1
|
|
fi
|
|
|
|
echo "PASS: $test_name"
|